OSDN Git Service

ARM: dts: BCM5301X: Make USB 3.0 PHY use MDIO PHY driver
authorVivek Unune <npcomplete13@gmail.com>
Mon, 9 Apr 2018 22:31:53 +0000 (18:31 -0400)
committerFlorian Fainelli <f.fainelli@gmail.com>
Mon, 9 Jul 2018 15:12:11 +0000 (08:12 -0700)
Currently, the USB 3.0 PHY in bcm5301x.dtsi uses platform driver which
requires register range "ccb-mii" <0x18003000 0x1000>. This range
overlaps with MDIO cmd and param registers (<0x18003000 0x8>).
Essentially, the platform driver partly acts like a MDIO bus driver,
hence to use of this register range.

In some Northstar devices like Linksys EA9500, secondary switch is
connected via external MDIO. The only way to access and configure the
external switch is via MDIO bus. When we enable the MDIO bus in it's
current state, the MDIO bus and any child buses fail to register because
of the register range overlap.

On Northstar, the USB 3.0 PHY is connected at address 0x10 on the
internal MDIO bus. This change moves the usb3_phy node and makes it a
child node of internal MDIO bus.

Thanks to Rafał Miłecki's commit af850e14a7ae ("phy: bcm-ns-usb3: add
MDIO driver using proper bus layer") the same USB 3.0 platform driver
can now act as USB 3.0 PHY MDIO driver.

Tested on Linksys Panamera (EA9500)

Signed-off-by: Vivek Unune <npcomplete13@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
34 files changed:
arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
arch/arm/boot/dts/bcm4708-netgear-r6250.dts
arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
arch/arm/boot/dts/bcm4709-netgear-r7000.dts
arch/arm/boot/dts/bcm4709-netgear-r8000.dts
arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
arch/arm/boot/dts/bcm47094-linksys-panamera.dts
arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
arch/arm/boot/dts/bcm47094-netgear-r8500.dts
arch/arm/boot/dts/bcm47094.dtsi
arch/arm/boot/dts/bcm5301x.dtsi
arch/arm/boot/dts/bcm94708.dts
arch/arm/boot/dts/bcm94709.dts
arch/arm/boot/dts/bcm953012er.dts
arch/arm/boot/dts/bcm953012hr.dts
arch/arm/boot/dts/bcm953012k.dts

index ff2e551..79d454f 100644 (file)
@@ -90,3 +90,7 @@
                };
        };
 };
+
+&usb3_phy {
+       status = "okay";
+};
index 3bcc037..99365bb 100644 (file)
@@ -80,3 +80,7 @@
                };
        };
 };
+
+&usb3_phy {
+       status = "okay";
+};
index a587384..bc330b1 100644 (file)
 &spi_nor {
        status = "okay";
 };
+
+&usb3_phy {
+       status = "okay";
+};
index 6c8f0ad..258d2b2 100644 (file)
@@ -38,3 +38,7 @@
                };
        };
 };
+
+&usb3_phy {
+       status = "okay";
+};
index ebda45f..e7fdaed 100644 (file)
@@ -57,3 +57,7 @@
 &spi_nor {
        status = "okay";
 };
+
+&usb3_phy {
+       status = "okay";
+};
index 9dd0e22..42bafc6 100644 (file)
@@ -64,3 +64,7 @@
 &spi_nor {
        status = "okay";
 };
+
+&usb3_phy {
+       status = "okay";
+};
index d7c34fa..dce35eb 100644 (file)
@@ -91,3 +91,7 @@
 &spi_nor {
        status = "okay";
 };
+
+&usb3_phy {
+       status = "okay";
+};
index 2642494..b7a024b 100644 (file)
@@ -83,3 +83,7 @@
 &spi_nor {
        status = "okay";
 };
+
+&usb3_phy {
+       status = "okay";
+};
index e7b09b7..f7f834c 100644 (file)
                };
        };
 };
+
+&usb3_phy {
+       status = "okay";
+};
index 16314fc..76a2bab 100644 (file)
@@ -74,3 +74,7 @@
                };
        };
 };
+
+&usb3_phy {
+       status = "okay";
+};
index 328aa90..69e3570 100644 (file)
                };
        };
 };
+
+&usb3_phy {
+       status = "okay";
+};
index 8ea46ee..0f6f0fe 100644 (file)
                };
        };
 };
+
+&usb3_phy {
+       status = "okay";
+};
index 5eeac73..f770897 100644 (file)
@@ -57,3 +57,7 @@
 &spi_nor {
        status = "okay";
 };
+
+&usb3_phy {
+       status = "okay";
+};
index da4d9ec..4d42786 100644 (file)
 &spi_nor {
        status = "okay";
 };
+
+&usb3_phy {
+       status = "okay";
+};
index c94c732..5f663f8 100644 (file)
@@ -99,3 +99,7 @@
 &usb2 {
        vcc-gpio = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
 };
+
+&usb3_phy {
+       status = "okay";
+};
index 2227181..2033411 100644 (file)
@@ -62,3 +62,7 @@
                };
        };
 };
+
+&usb3_phy {
+       status = "okay";
+};
index 79a9633..77d1687 100644 (file)
 &spi_nor {
        status = "okay";
 };
+
+&usb3_phy {
+       status = "okay";
+};
index db744a5..983149b 100644 (file)
@@ -39,3 +39,7 @@
                };
        };
 };
+
+&usb3_phy {
+       status = "okay";
+};
index 9e267d3..ca41481 100644 (file)
 &usb3 {
        vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
 };
+
+&usb3_phy {
+       status = "okay";
+};
index d266131..aa69e65 100644 (file)
 &usb3 {
        vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
 };
+
+&usb3_phy {
+       status = "okay";
+};
index f5bf658..c7143a9 100644 (file)
 &spi_nor {
        status = "okay";
 };
+
+&usb3_phy {
+       status = "okay";
+};
index d173bcd..03c1ab1 100644 (file)
 &spi_nor {
        status = "okay";
 };
+
+&usb3_phy {
+       status = "okay";
+};
index f47afe3..cbe8ffe 100644 (file)
@@ -33,3 +33,7 @@
                };
        };
 };
+
+&usb3_phy {
+       status = "okay";
+};
index a5cef51..3e5e997 100644 (file)
@@ -60,3 +60,7 @@
 &spi_nor {
        status = "okay";
 };
+
+&usb3_phy {
+       status = "okay";
+};
index 7496aab..7acbecd 100644 (file)
@@ -60,3 +60,7 @@
 &spi_nor {
        status = "okay";
 };
+
+&usb3_phy {
+       status = "okay";
+};
index 53aaa52..f4558d9 100644 (file)
 &spi_nor {
        status = "okay";
 };
+
+&usb3_phy {
+       status = "okay";
+};
index 0e718ed..3071938 100644 (file)
@@ -91,3 +91,7 @@
                };
        };
 };
+
+&usb3_phy {
+       status = "okay";
+};
index 4840a78..f7c3e27 100644 (file)
@@ -7,9 +7,10 @@
 #include "bcm4708.dtsi"
 
 / {
-       usb3_phy: usb3-phy {
-               compatible = "brcm,ns-bx-usb3-phy";
-       };
+};
+
+&usb3_phy {
+       compatible = "brcm,ns-bx-usb3-phy";
 };
 
 &uart0 {
index 9a076c4..096fb76 100644 (file)
                clock-names = "phy-ref-clk";
        };
 
-       usb3_phy: usb3-phy {
-               compatible = "brcm,ns-ax-usb3-phy";
-               reg = <0x18105000 0x1000>, <0x18003000 0x1000>;
-               reg-names = "dmp", "ccb-mii";
-               #phy-cells = <0>;
-       };
-
        axi@18000000 {
                compatible = "brcm,bus-axi";
                reg = <0x18000000 0x1000>;
                reg = <0x18003000 0x8>;
                #size-cells = <1>;
                #address-cells = <0>;
-               status = "disabled";
+       };
+
+       mdio-bus-mux {
+               compatible = "mdio-mux-mmioreg";
+               mdio-parent-bus = <&mdio>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               reg = <0x18003000 0x4>;
+               mux-mask = <0x200>;
+
+               mdio@0 {
+                       reg = <0x0>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       usb3_phy: usb3-phy@10 {
+                               compatible = "brcm,ns-ax-usb3-phy";
+                               reg = <0x10>;
+                               usb3-dmp-syscon = <&usb3_dmp>;
+                               #phy-cells = <0>;
+                               status = "disabled";
+                       };
+               };
+       };
+
+       usb3_dmp: syscon@18105000 {
+               reg = <0x18105000 0x1000>;
        };
 
        i2c0: i2c@18009000 {
index 2e08c89..934f07a 100644 (file)
@@ -42,3 +42,7 @@
                reg = <0x00000000 0x08000000>;
        };
 };
+
+&usb3_phy {
+       status = "okay";
+};
index c37616c..31e4dd0 100644 (file)
@@ -42,3 +42,7 @@
                reg = <0x00000000 0x08000000>;
        };
 };
+
+&usb3_phy {
+       status = "okay";
+};
index 40e694b..17f63c7 100644 (file)
@@ -90,3 +90,7 @@
                };
        };
 };
+
+&usb3_phy {
+       status = "okay";
+};
index 3076e81..11b0f5e 100644 (file)
@@ -95,3 +95,7 @@
                reg = <0x00700000 0x00900000>;
        };
 };
+
+&usb3_phy {
+       status = "okay";
+};
index 79c168e..e798055 100644 (file)
 &uart1 {
        status = "okay";
 };
+
+&usb3_phy {
+       status = "okay";
+};