086-ipq8064-fix-duplicate-node.patch 2.3 KB

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