target/linux/sunxi/patches-4.14/310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th.patch

   1 From 49cd9ea6dc8d68eb519ccd9f31c9730dec8a181a Mon Sep 17 00:00:00 2001
   2 From: Hauke Mehrtens <hauke@hauke-m.de>
   3 Date: Thu, 8 Mar 2018 22:14:50 +0100
   4 Subject: [PATCH] Revert "ARM: dts: sun7i: Add BCM53125 switch nodes to the
   5  lamobo-r1 board"
   6
   7 This reverts the changes needed for the upstream b53 DSA switch driver
   8 to use the OpenWrt b43 swconfig switch driver.
   9
  10 This reverts commit 0cdefd5b5485ee6eb3512a75739d09a4090176ed.
  11 This reverts commit d7b9eaff5f0ca00726336b4c0c3c29decf30412a.
  12 ---
  13  arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 60 ++-----------------------------
  14  1 file changed, 3 insertions(+), 57 deletions(-)
  15
  16 --- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
  17 +++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
  18 @@ -109,67 +109,13 @@
  19  &gmac {
  20         pinctrl-names = "default";
  21         pinctrl-0 = <&gmac_pins_rgmii_a>;
  22 +       phy = <&phy1>;
  23         phy-mode = "rgmii";
  24         phy-supply = <&reg_gmac_3v3>;
  25         status = "okay";
  26
  27 -       fixed-link {
  28 -               speed = <1000>;
  29 -               full-duplex;
  30 -       };
  31 -
  32 -       mdio {
  33 -               compatible = "snps,dwmac-mdio";
  34 -               #address-cells = <1>;
  35 -               #size-cells = <0>;
  36 -
  37 -               switch: ethernet-switch@1e {
  38 -                       compatible = "brcm,bcm53125";
  39 -                       reg = <30>;
  40 -                       #address-cells = <1>;
  41 -                       #size-cells = <0>;
  42 -
  43 -                       ports {
  44 -                               #address-cells = <1>;
  45 -                               #size-cells = <0>;
  46 -
  47 -                               port0: port@0 {
  48 -                                       reg = <0>;
  49 -                                       label = "lan2";
  50 -                               };
  51 -
  52 -                               port1: port@1 {
  53 -                                       reg = <1>;
  54 -                                       label = "lan3";
  55 -                               };
  56 -
  57 -                               port2: port@2 {
  58 -                                       reg = <2>;
  59 -                                       label = "lan4";
  60 -                               };
  61 -
  62 -                               port3: port@3 {
  63 -                                       reg = <3>;
  64 -                                       label = "wan";
  65 -                               };
  66 -
  67 -                               port4: port@4 {
  68 -                                       reg = <4>;
  69 -                                       label = "lan1";
  70 -                               };
  71 -
  72 -                               port8: port@8 {
  73 -                                       reg = <8>;
  74 -                                       label = "cpu";
  75 -                                       ethernet = <&gmac>;
  76 -                                       phy-mode = "rgmii-txid";
  77 -                                       fixed-link {
  78 -                                               speed = <1000>;
  79 -                                               full-duplex;
  80 -                                       };
  81 -                               };
  82 -                       };
  83 -               };
  84 +       phy1: ethernet-phy@1 {
  85 +               reg = <1>;
  86         };
  87  };
  88