8f9e91ad03
These patches were generated from: https://github.com/raspberrypi/linux/commits/rpi-6.12.y With the following command: git format-patch -N v6.12.27..HEAD (HEAD -> 8d3206ee456a5ecdf9ddbfd8e5e231e4f0cd716e) Exceptions: - (def)configs patches - github workflows patches - applied & reverted patches - readme patches - wireless patches Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
From e4070eb4a4305c0fe4510f0a5e8f5860ab051a45 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Mon, 11 Nov 2024 15:18:14 +0000
|
|
Subject: [PATCH] dt: arm64: Fixup RP1 ethernet DT configuration
|
|
|
|
Configure RP1's ethernet block to do the correct thing.
|
|
clk_eth is intended to be fixed at 125MHz, so use a new compatible,
|
|
and use assigned-clocks to configure the clock appropriately.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
arch/arm64/boot/dts/broadcom/rp1.dtsi | 10 +++++++---
|
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/broadcom/rp1.dtsi
|
|
+++ b/arch/arm64/boot/dts/broadcom/rp1.dtsi
|
|
@@ -32,6 +32,7 @@
|
|
// RP1_PLL_VIDEO_CORE and dividers are now managed by VEC,DPI drivers
|
|
<&rp1_clocks RP1_PLL_SYS>,
|
|
<&rp1_clocks RP1_PLL_SYS_SEC>,
|
|
+ <&rp1_clocks RP1_CLK_ETH>,
|
|
<&rp1_clocks RP1_PLL_AUDIO>,
|
|
<&rp1_clocks RP1_PLL_AUDIO_SEC>,
|
|
<&rp1_clocks RP1_CLK_SYS>,
|
|
@@ -46,6 +47,7 @@
|
|
<1536000000>, // RP1_PLL_AUDIO_CORE
|
|
<200000000>, // RP1_PLL_SYS
|
|
<125000000>, // RP1_PLL_SYS_SEC
|
|
+ <125000000>, // RP1_CLK_ETH
|
|
<61440000>, // RP1_PLL_AUDIO
|
|
<192000000>, // RP1_PLL_AUDIO_SEC
|
|
<200000000>, // RP1_CLK_SYS
|
|
@@ -976,12 +978,14 @@
|
|
|
|
rp1_eth: ethernet@100000 {
|
|
reg = <0xc0 0x40100000 0x0 0x4000>;
|
|
- compatible = "cdns,macb";
|
|
+ compatible = "raspberrypi,rp1-gem", "cdns,macb";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
interrupts = <RP1_INT_ETH IRQ_TYPE_LEVEL_HIGH>;
|
|
- clocks = <&macb_pclk &macb_hclk &rp1_clocks RP1_CLK_ETH_TSU>;
|
|
- clock-names = "pclk", "hclk", "tsu_clk";
|
|
+ clocks = <&macb_pclk &macb_hclk
|
|
+ &rp1_clocks RP1_CLK_ETH_TSU
|
|
+ &rp1_clocks RP1_CLK_ETH>;
|
|
+ clock-names = "pclk", "hclk", "tsu_clk", "tx_clk";
|
|
phy-mode = "rgmii-id";
|
|
cdns,aw2w-max-pipe = /bits/ 8 <8>;
|
|
cdns,ar2r-max-pipe = /bits/ 8 <8>;
|