Skip to content

Commit 568882d

Browse files
committed
ARM: dts: bcm2838: Backport genet from upstream
This backport all genet differences (different compatible, right PHY mode, board specific stuff) from upstream. Signed-off-by: Stefan Wahren <[email protected]>
1 parent 6b5698a commit 568882d

File tree

3 files changed

+32
-13
lines changed

3 files changed

+32
-13
lines changed

arch/arm/boot/dts/bcm2711-rpi-4-b.dts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,20 @@
134134
vqmmc-supply = <&sd_io_1v8_reg>;
135135
};
136136

137+
&genet {
138+
phy-handle = <&phy1>;
139+
phy-mode = "rgmii-rxid";
140+
status = "okay";
141+
};
142+
143+
&genet_mdio {
144+
phy1: ethernet-phy@1 {
145+
/* No PHY interrupt */
146+
reg = <0x1>;
147+
led-modes = <0x00 0x08>; /* link/activity link */
148+
};
149+
};
150+
137151
&leds {
138152
act_led: act {
139153
label = "led0";

arch/arm/boot/dts/bcm2838-rpi-4-b.dts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,20 @@
9898
vqmmc-supply = <&sd_io_1v8_reg>;
9999
};
100100

101+
&genet {
102+
phy-handle = <&phy1>;
103+
phy-mode = "rgmii-rxid";
104+
status = "okay";
105+
};
106+
107+
&genet_mdio {
108+
phy1: ethernet-phy@1 {
109+
/* No PHY interrupt */
110+
reg = <0x1>;
111+
led-modes = <0x00 0x08>; /* link/activity link */
112+
};
113+
};
114+
101115
/* uart0 communicates with the BT module */
102116
&uart0 {
103117
pinctrl-names = "default";

arch/arm/boot/dts/bcm2838.dtsi

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -346,29 +346,20 @@
346346
};
347347

348348
genet: ethernet@7d580000 {
349-
compatible = "brcm,genet-v5";
349+
compatible = "brcm,bcm2711-genet-v5", "brcm,genet-v5";
350350
reg = <0x0 0x7d580000 0x10000>;
351-
status = "okay";
352351
#address-cells = <0x1>;
353352
#size-cells = <0x1>;
354353
interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>,
355354
<GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
356-
phy-handle = <&phy1>;
357-
phy-mode = "rgmii";
358-
mdio@e14 {
355+
status = "disabled";
356+
357+
genet_mdio: mdio@e14 {
359358
#address-cells = <0x0>;
360359
#size-cells = <0x1>;
361360
compatible = "brcm,genet-mdio-v5";
362361
reg = <0xe14 0x8>;
363362
reg-names = "mdio";
364-
phy1: ethernet-phy@0 {
365-
compatible =
366-
"ethernet-phy-ieee802.3-c22";
367-
/* No interrupts - use PHY_POLL */
368-
max-speed = <1000>;
369-
reg = <0x1>;
370-
led-modes = <0x00 0x08>; /* link/activity link */
371-
};
372363
};
373364
};
374365

0 commit comments

Comments
 (0)