310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th.patch 1.8 KB

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