Skip to content

Commit

Permalink
ARM: dts: bcm2838: Backport genet from upstream
Browse files Browse the repository at this point in the history
This backport all genet differences (different compatible, right PHY mode,
board specific stuff) from upstream.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  • Loading branch information
lategoodbye authored and pelwell committed Jan 17, 2020
1 parent 31b2dfd commit d85fd40
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 13 deletions.
14 changes: 14 additions & 0 deletions arch/arm/boot/dts/bcm2711-rpi-4-b.dts
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,20 @@
vqmmc-supply = <&sd_io_1v8_reg>;
};

&genet {
phy-handle = <&phy1>;
phy-mode = "rgmii-rxid";
status = "okay";
};

&genet_mdio {
phy1: ethernet-phy@1 {
/* No PHY interrupt */
reg = <0x1>;
led-modes = <0x00 0x08>; /* link/activity link */
};
};

&leds {
act_led: act {
label = "led0";
Expand Down
14 changes: 14 additions & 0 deletions arch/arm/boot/dts/bcm2838-rpi-4-b.dts
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,20 @@
vqmmc-supply = <&sd_io_1v8_reg>;
};

&genet {
phy-handle = <&phy1>;
phy-mode = "rgmii-rxid";
status = "okay";
};

&genet_mdio {
phy1: ethernet-phy@1 {
/* No PHY interrupt */
reg = <0x1>;
led-modes = <0x00 0x08>; /* link/activity link */
};
};

/* uart0 communicates with the BT module */
&uart0 {
pinctrl-names = "default";
Expand Down
17 changes: 4 additions & 13 deletions arch/arm/boot/dts/bcm2838.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -346,29 +346,20 @@
};

genet: ethernet@7d580000 {
compatible = "brcm,genet-v5";
compatible = "brcm,bcm2711-genet-v5", "brcm,genet-v5";
reg = <0x0 0x7d580000 0x10000>;
status = "okay";
#address-cells = <0x1>;
#size-cells = <0x1>;
interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
phy-handle = <&phy1>;
phy-mode = "rgmii";
mdio@e14 {
status = "disabled";

genet_mdio: mdio@e14 {
#address-cells = <0x0>;
#size-cells = <0x1>;
compatible = "brcm,genet-mdio-v5";
reg = <0xe14 0x8>;
reg-names = "mdio";
phy1: ethernet-phy@0 {
compatible =
"ethernet-phy-ieee802.3-c22";
/* No interrupts - use PHY_POLL */
max-speed = <1000>;
reg = <0x1>;
led-modes = <0x00 0x08>; /* link/activity link */
};
};
};

Expand Down

0 comments on commit d85fd40

Please sign in to comment.