target/linux/ipq806x/patches-5.10/086-ipq8064-fix-duplicate-node.patch

   1 diff --git a/qcom-ipq8064-rb3011.dts.orig b/qcom-ipq8064-rb3011.dts
   2 index 282b89ce3d..4faaa95b33 100644
   3 --- a/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts
   4 +++ b/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts
   5 @@ -24,73 +24,6 @@ memory@0 {
   6                 device_type = "memory";
   7         };
   8
   9 -       mdio0: mdio@0 {
  10 -               status = "okay";
  11 -               compatible = "virtual,mdio-gpio";
  12 -               gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
  13 -                       <&qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
  14 -               #address-cells = <1>;
  15 -               #size-cells = <0>;
  16 -
  17 -               pinctrl-0 = <&mdio0_pins>;
  18 -               pinctrl-names = "default";
  19 -
  20 -               switch0: switch@10 {
  21 -                       compatible = "qca,qca8337";
  22 -                       #address-cells = <1>;
  23 -                       #size-cells = <0>;
  24 -
  25 -                       dsa,member = <0 0>;
  26 -
  27 -                       pinctrl-0 = <&sw0_reset_pin>;
  28 -                       pinctrl-names = "default";
  29 -
  30 -                       reset-gpios = <&qcom_pinmux 16 GPIO_ACTIVE_LOW>;
  31 -                       reg = <0x10>;
  32 -
  33 -                       ports {
  34 -                               #address-cells = <1>;
  35 -                               #size-cells = <0>;
  36 -
  37 -                               switch0cpu: port@0 {
  38 -                                       reg = <0>;
  39 -                                       label = "cpu";
  40 -                                       ethernet = <&gmac0>;
  41 -                                       phy-mode = "rgmii-id";
  42 -                                       fixed-link {
  43 -                                               speed = <1000>;
  44 -                                               full-duplex;
  45 -                                       };
  46 -                               };
  47 -
  48 -                               port@1 {
  49 -                                       reg = <1>;
  50 -                                       label = "sw1";
  51 -                               };
  52 -
  53 -                               port@2 {
  54 -                                       reg = <2>;
  55 -                                       label = "sw2";
  56 -                               };
  57 -
  58 -                               port@3 {
  59 -                                       reg = <3>;
  60 -                                       label = "sw3";
  61 -                               };
  62 -
  63 -                               port@4 {
  64 -                                       reg = <4>;
  65 -                                       label = "sw4";
  66 -                               };
  67 -
  68 -                               port@5 {
  69 -                                       reg = <5>;
  70 -                                       label = "sw5";
  71 -                               };
  72 -                       };
  73 -               };
  74 -       };
  75 -
  76         mdio1: mdio@1 {
  77                 status = "okay";
  78                 compatible = "virtual,mdio-gpio";
  79 @@ -216,6 +149,68 @@ led@7 {
  80         };
  81  };
  82
  83 +&mdio0 {
  84 +       status = "okay";
  85 +
  86 +       pinctrl-0 = <&mdio0_pins>;
  87 +       pinctrl-names = "default";
  88 +
  89 +       switch0: switch@10 {
  90 +               compatible = "qca,qca8337";
  91 +               #address-cells = <1>;
  92 +               #size-cells = <0>;
  93 +
  94 +               dsa,member = <0 0>;
  95 +
  96 +               pinctrl-0 = <&sw0_reset_pin>;
  97 +               pinctrl-names = "default";
  98 +
  99 +               reset-gpios = <&qcom_pinmux 16 GPIO_ACTIVE_LOW>;
 100 +               reg = <0x10>;
 101 +
 102 +               ports {
 103 +                       #address-cells = <1>;
 104 +                       #size-cells = <0>;
 105 +
 106 +                       switch0cpu: port@0 {
 107 +                               reg = <0>;
 108 +                               label = "cpu";
 109 +                               ethernet = <&gmac0>;
 110 +                               phy-mode = "rgmii-id";
 111 +                               fixed-link {
 112 +                                       speed = <1000>;
 113 +                                       full-duplex;
 114 +                               };
 115 +                       };
 116 +
 117 +                       port@1 {
 118 +                               reg = <1>;
 119 +                               label = "sw1";
 120 +                       };
 121 +
 122 +                       port@2 {
 123 +                               reg = <2>;
 124 +                               label = "sw2";
 125 +                       };
 126 +
 127 +                       port@3 {
 128 +                               reg = <3>;
 129 +                               label = "sw3";
 130 +                       };
 131 +
 132 +                       port@4 {
 133 +                               reg = <4>;
 134 +                               label = "sw4";
 135 +                       };
 136 +
 137 +                       port@5 {
 138 +                               reg = <5>;
 139 +                               label = "sw5";
 140 +                       };
 141 +               };
 142 +       };
 143 +};
 144 +
 145  &gmac0 {
 146         status = "okay";
 147