target/linux/bcm27xx/patches-5.4/950-0382-ARM-dts-bcm2838-Backport-genet-from-upstream.patch

   1 From 30bd619480b6a2b92d404a61a1e90ddb76ae4be8 Mon Sep 17 00:00:00 2001
   2 From: Stefan Wahren <wahrenst@gmx.net>
   3 Date: Wed, 25 Dec 2019 16:40:47 +0100
   4 Subject: [PATCH] ARM: dts: bcm2838: Backport genet from upstream
   5
   6 This backport all genet differences (different compatible, right PHY mode,
   7 board specific stuff) from upstream.
   8
   9 Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  10 ---
  11  arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 14 ++++++++++++++
  12  arch/arm/boot/dts/bcm2838-rpi-4-b.dts | 14 ++++++++++++++
  13  arch/arm/boot/dts/bcm2838.dtsi        | 17 ++++-------------
  14  3 files changed, 32 insertions(+), 13 deletions(-)
  15
  16 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
  17 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
  18 @@ -134,6 +134,20 @@
  19         vqmmc-supply = <&sd_io_1v8_reg>;
  20  };
  21
  22 +&genet {
  23 +       phy-handle = <&phy1>;
  24 +       phy-mode = "rgmii-rxid";
  25 +       status = "okay";
  26 +};
  27 +
  28 +&genet_mdio {
  29 +       phy1: ethernet-phy@1 {
  30 +               /* No PHY interrupt */
  31 +               reg = <0x1>;
  32 +               led-modes = <0x00 0x08>; /* link/activity link */
  33 +       };
  34 +};
  35 +
  36  &leds {
  37         act_led: act {
  38                 label = "led0";
  39 --- a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts
  40 +++ b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts
  41 @@ -98,6 +98,20 @@
  42         vqmmc-supply = <&sd_io_1v8_reg>;
  43  };
  44
  45 +&genet {
  46 +       phy-handle = <&phy1>;
  47 +       phy-mode = "rgmii-rxid";
  48 +       status = "okay";
  49 +};
  50 +
  51 +&genet_mdio {
  52 +       phy1: ethernet-phy@1 {
  53 +               /* No PHY interrupt */
  54 +               reg = <0x1>;
  55 +               led-modes = <0x00 0x08>; /* link/activity link */
  56 +       };
  57 +};
  58 +
  59  /* uart0 communicates with the BT module */
  60  &uart0 {
  61         pinctrl-names = "default";
  62 --- a/arch/arm/boot/dts/bcm2838.dtsi
  63 +++ b/arch/arm/boot/dts/bcm2838.dtsi
  64 @@ -346,29 +346,20 @@
  65                 };
  66
  67                 genet: ethernet@7d580000 {
  68 -                       compatible = "brcm,genet-v5";
  69 +                       compatible = "brcm,bcm2711-genet-v5", "brcm,genet-v5";
  70                         reg = <0x0 0x7d580000 0x10000>;
  71 -                       status = "okay";
  72                         #address-cells = <0x1>;
  73                         #size-cells = <0x1>;
  74                         interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>,
  75                                      <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
  76 -                       phy-handle = <&phy1>;
  77 -                       phy-mode = "rgmii";
  78 -                       mdio@e14 {
  79 +                       status = "disabled";
  80 +
  81 +                       genet_mdio: mdio@e14 {
  82                                 #address-cells = <0x0>;
  83                                 #size-cells = <0x1>;
  84                                 compatible = "brcm,genet-mdio-v5";
  85                                 reg = <0xe14 0x8>;
  86                                 reg-names = "mdio";
  87 -                               phy1: ethernet-phy@0 {
  88 -                                       compatible =
  89 -                                               "ethernet-phy-ieee802.3-c22";
  90 -                                       /* No interrupts - use PHY_POLL */
  91 -                                       max-speed = <1000>;
  92 -                                       reg = <0x1>;
  93 -                                       led-modes = <0x00 0x08>; /* link/activity link */
  94 -                               };
  95                         };
  96                 };
  97