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

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