Skip to content

Commit 0b4af92

Browse files
6by9pelwell
authored andcommitted
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>
1 parent eb836a6 commit 0b4af92

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

arch/arm64/boot/dts/broadcom/rp1.dtsi

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
// RP1_PLL_VIDEO_CORE and dividers are now managed by VEC,DPI drivers
3333
<&rp1_clocks RP1_PLL_SYS>,
3434
<&rp1_clocks RP1_PLL_SYS_SEC>,
35+
<&rp1_clocks RP1_CLK_ETH>,
3536
<&rp1_clocks RP1_PLL_AUDIO>,
3637
<&rp1_clocks RP1_PLL_AUDIO_SEC>,
3738
<&rp1_clocks RP1_CLK_SYS>,
@@ -46,6 +47,7 @@
4647
<1536000000>, // RP1_PLL_AUDIO_CORE
4748
<200000000>, // RP1_PLL_SYS
4849
<125000000>, // RP1_PLL_SYS_SEC
50+
<125000000>, // RP1_CLK_ETH
4951
<61440000>, // RP1_PLL_AUDIO
5052
<192000000>, // RP1_PLL_AUDIO_SEC
5153
<200000000>, // RP1_CLK_SYS
@@ -976,12 +978,14 @@
976978

977979
rp1_eth: ethernet@100000 {
978980
reg = <0xc0 0x40100000 0x0 0x4000>;
979-
compatible = "cdns,macb";
981+
compatible = "raspberrypi,rp1-gem", "cdns,macb";
980982
#address-cells = <1>;
981983
#size-cells = <0>;
982984
interrupts = <RP1_INT_ETH IRQ_TYPE_LEVEL_HIGH>;
983-
clocks = <&macb_pclk &macb_hclk &rp1_clocks RP1_CLK_ETH_TSU>;
984-
clock-names = "pclk", "hclk", "tsu_clk";
985+
clocks = <&macb_pclk &macb_hclk
986+
&rp1_clocks RP1_CLK_ETH_TSU
987+
&rp1_clocks RP1_CLK_ETH>;
988+
clock-names = "pclk", "hclk", "tsu_clk", "tx_clk";
985989
phy-mode = "rgmii-id";
986990
cdns,aw2w-max-pipe = /bits/ 8 <8>;
987991
cdns,ar2r-max-pipe = /bits/ 8 <8>;

0 commit comments

Comments
 (0)