ramips: fix usbphy DT nodes on linux 4.14

The Ralink USB PHY driver merged into mainline has a slightly different
device tree binding than the patch that was used with linux 4.9.
The new driver requires a `ralink,sysctl` node pointing to the `syscon`
node.

This patch also sets `#phy-cells` to 0, as recommended by the mainline
documentation [1].

[1] Documentation/devicetree/bindings/phy/ralink-usb-phy.txt

Signed-off-by: Vianney le Clément de Saint-Marcq <code@quartic.eu>

diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi
index 882cf8810417e94de059cdfbcef477a0d0b98bd6..83ff102745e6ec9d022928ab21f543e2bb95319d 100644 (file)
--- a/target/linux/ramips/dts/mt7620a.dtsi
+++ b/target/linux/ramips/dts/mt7620a.dtsi
@@ -35,7 +35,7 @@
                #size-cells = <1>;
 
                sysc: sysc@0 {
-                       compatible = "ralink,mt7620a-sysc", "ralink,rt3050-sysc";
+                       compatible = "ralink,mt7620a-sysc", "ralink,rt3050-sysc", "syscon";
                        reg = <0x0 0x100>;
                };
 
@@ -427,8 +427,9 @@
 
        usbphy: usbphy {
                compatible = "mediatek,mt7620-usbphy";
-               #phy-cells = <1>;
+               #phy-cells = <0>;
 
+               ralink,sysctl = <&sysc>;
                resets = <&rstctrl 22 &rstctrl 25>;
                reset-names = "host", "device";
 
@@ -501,7 +502,7 @@
                interrupt-parent = <&intc>;
                interrupts = <18>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                status = "disabled";
@@ -514,7 +515,7 @@
                interrupt-parent = <&intc>;
                interrupts = <18>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                status = "disabled";

diff --git a/target/linux/ramips/dts/mt7620n.dtsi b/target/linux/ramips/dts/mt7620n.dtsi
index ebaa0946009eda1c3a0070755ca0c54c6d423391..4eb1dde8a22e0cbc037056131efa012743a12fd5 100644 (file)
--- a/target/linux/ramips/dts/mt7620n.dtsi
+++ b/target/linux/ramips/dts/mt7620n.dtsi
@@ -35,7 +35,7 @@
                #size-cells = <1>;
 
                sysc: sysc@0 {
-                       compatible = "ralink,mt7620a-sysc", "ralink,rt3050-sysc";
+                       compatible = "ralink,mt7620a-sysc", "ralink,rt3050-sysc", "syscon";
                        reg = <0x0 0x100>;
                };
 
@@ -269,8 +269,9 @@
 
        usbphy: usbphy {
                compatible = "mediatek,mt7620-usbphy";
-               #phy-cells = <1>;
+               #phy-cells = <0>;
 
+               ralink,sysctl = <&sysc>;
                resets = <&rstctrl 22 &rstctrl 25>;
                reset-names = "host", "device";
 
@@ -327,7 +328,7 @@
                interrupt-parent = <&intc>;
                interrupts = <18>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                status = "disabled";
@@ -337,7 +338,7 @@
                compatible = "generic-ohci";
                reg = <0x101c1000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;

diff --git a/target/linux/ramips/dts/mt7628an.dtsi b/target/linux/ramips/dts/mt7628an.dtsi
index b572f2ae40d14fc29af4c1355427c9e1048aa23f..b5edf506f8dfa46932e55bc08371ff4d4f47a4e2 100644 (file)
--- a/target/linux/ramips/dts/mt7628an.dtsi
+++ b/target/linux/ramips/dts/mt7628an.dtsi
@@ -33,7 +33,7 @@
                #size-cells = <1>;
 
                sysc: sysc@0 {
-                       compatible = "ralink,mt7620a-sysc";
+                       compatible = "ralink,mt7620a-sysc", "syscon";
                        reg = <0x0 0x100>;
                };
 
@@ -375,8 +375,9 @@
        usbphy: usbphy@10120000 {
                compatible = "ralink,mt7628an-usbphy", "mediatek,mt7620-usbphy";
                reg = <0x10120000 0x1000>;
-               #phy-cells = <1>;
+               #phy-cells = <0>;
 
+               ralink,sysctl = <&sysc>;
                resets = <&rstctrl 22 &rstctrl 25>;
                reset-names = "host", "device";
                clocks = <&clkctrl 22 &clkctrl 25>;
@@ -400,7 +401,7 @@
                compatible = "generic-ehci";
                reg = <0x101c0000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;
@@ -411,7 +412,7 @@
                compatible = "generic-ohci";
                reg = <0x101c1000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;

diff --git a/target/linux/ramips/dts/rt3050.dtsi b/target/linux/ramips/dts/rt3050.dtsi
index 5c69d282a3fc5db664b2172746764a27f613e62a..bd51838bacdbb93457531e089e70bff2388ac310 100644 (file)
--- a/target/linux/ramips/dts/rt3050.dtsi
+++ b/target/linux/ramips/dts/rt3050.dtsi
@@ -34,7 +34,7 @@
                #size-cells = <1>;
 
                sysc: sysc@0 {
-                       compatible = "ralink,rt3050-sysc";
+                       compatible = "ralink,rt3050-sysc", "syscon";
                        reg = <0x0 0x100>;
                };
 
@@ -287,6 +287,9 @@
 
        usbphy: usbphy {
                compatible = "ralink,rt3050-usbphy";
+               #phy-cells = <0>;
+
+               ralink,sysctl = <&sysc>;
                resets = <&rstctrl 22>;
                reset-names = "host";
                clocks = <&clkctrl 18>;

diff --git a/target/linux/ramips/dts/rt3352.dtsi b/target/linux/ramips/dts/rt3352.dtsi
index 5612458f108d3a0de4b0efa5d9fa51aa8fbd5320..e6e49eeafd9eba5abc77ecffb2666675fd304cab 100644 (file)
--- a/target/linux/ramips/dts/rt3352.dtsi
+++ b/target/linux/ramips/dts/rt3352.dtsi
@@ -35,7 +35,7 @@
                #size-cells = <1>;
 
                sysc: sysc@0 {
-                       compatible = "ralink,rt3352-sysc", "ralink,rt3050-sysc";
+                       compatible = "ralink,rt3352-sysc", "ralink,rt3050-sysc", "syscon";
                        reg = <0x0 0x100>;
                };
 
@@ -334,8 +334,9 @@
 
        usbphy: usbphy {
                compatible = "ralink,rt3352-usbphy";
-               #phy-cells = <1>;
+               #phy-cells = <0>;
 
+               ralink,sysctl = <&sysc>;
                resets = <&rstctrl 22 &rstctrl 25>;
                reset-names = "host", "device";
                clocks = <&clkctrl 18 &clkctrl 20>;
@@ -356,7 +357,7 @@
                compatible = "generic-ehci";
                reg = <0x101c0000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;
@@ -369,7 +370,7 @@
                compatible = "generic-ohci";
                reg = <0x101c1000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;

diff --git a/target/linux/ramips/dts/rt3883.dtsi b/target/linux/ramips/dts/rt3883.dtsi
index 64bc56b4a985e224908d8df4cfff1ffdcc4848eb..193a3ee1ccfb2e9466fd14f1bea3ec8dcf99cdeb 100644 (file)
--- a/target/linux/ramips/dts/rt3883.dtsi
+++ b/target/linux/ramips/dts/rt3883.dtsi
@@ -35,7 +35,7 @@
                #size-cells = <1>;
 
                sysc: sysc@0 {
-                       compatible = "ralink,rt3883-sysc", "ralink,rt3050-sysc";
+                       compatible = "ralink,rt3883-sysc", "ralink,rt3050-sysc", "syscon";
                        reg = <0x0 0x100>;
                };
 
@@ -427,8 +427,9 @@
 
        usbphy: usbphy {
                compatible = "ralink,rt3352-usbphy";
-               #phy-cells = <1>;
+               #phy-cells = <0>;
 
+               ralink,sysctl = <&sysc>;
                resets = <&rstctrl 22 &rstctrl 25>;
                reset-names = "host", "device";
                clocks = <&clkctrl 22 &clkctrl 25>;
@@ -449,7 +450,7 @@
                compatible = "generic-ehci";
                reg = <0x101c0000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;
@@ -462,7 +463,7 @@
                compatible = "generic-ohci";
                reg = <0x101c1000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;

diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi
index a92c1130437e367887321d1c6889f54611f19d91..843ea301946ed9b8ee9b22b85898c1be4e236563 100644 (file)
--- a/target/linux/ramips/dts/rt5350.dtsi
+++ b/target/linux/ramips/dts/rt5350.dtsi
@@ -35,7 +35,7 @@
                #size-cells = <1>;
 
                sysc: sysc@0 {
-                       compatible = "ralink,rt5350-sysc", "ralink,rt3050-sysc";
+                       compatible = "ralink,rt5350-sysc", "ralink,rt3050-sysc", "syscon";
                        reg = <0x0 0x100>;
                };
 
@@ -324,8 +324,9 @@
 
        usbphy: usbphy {
                compatible = "ralink,rt3352-usbphy";
-               #phy-cells = <1>;
+               #phy-cells = <0>;
 
+               ralink,sysctl = <&sysc>;
                resets = <&rstctrl 22 &rstctrl 25>;
                reset-names = "host", "device";
                clocks = <&clkctrl 18>;
@@ -370,7 +371,7 @@
                compatible = "generic-ehci";
                reg = <0x101c0000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;
@@ -381,7 +382,7 @@
                compatible = "generic-ohci";
                reg = <0x101c1000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;