ramips: fix usbphy DT nodes on linux 4.14
authorVianney le Clément de Saint-Marcq <code@quartic.eu>
Sat, 7 Apr 2018 12:02:25 +0000 (14:02 +0200)
committerFelix Fietkau <nbd@nbd.name>
Sat, 7 Apr 2018 15:53:34 +0000 (17:53 +0200)
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>
target/linux/ramips/dts/mt7620a.dtsi
target/linux/ramips/dts/mt7620n.dtsi
target/linux/ramips/dts/mt7628an.dtsi
target/linux/ramips/dts/rt3050.dtsi
target/linux/ramips/dts/rt3352.dtsi
target/linux/ramips/dts/rt3883.dtsi
target/linux/ramips/dts/rt5350.dtsi

index 882cf88..83ff102 100644 (file)
@@ -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>;
                };
 
 
        usbphy: usbphy {
                compatible = "mediatek,mt7620-usbphy";
-               #phy-cells = <1>;
+               #phy-cells = <0>;
 
+               ralink,sysctl = <&sysc>;
                resets = <&rstctrl 22 &rstctrl 25>;
                reset-names = "host", "device";
 
                interrupt-parent = <&intc>;
                interrupts = <18>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                status = "disabled";
                interrupt-parent = <&intc>;
                interrupts = <18>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                status = "disabled";
index ebaa094..4eb1dde 100644 (file)
@@ -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>;
                };
 
 
        usbphy: usbphy {
                compatible = "mediatek,mt7620-usbphy";
-               #phy-cells = <1>;
+               #phy-cells = <0>;
 
+               ralink,sysctl = <&sysc>;
                resets = <&rstctrl 22 &rstctrl 25>;
                reset-names = "host", "device";
 
                interrupt-parent = <&intc>;
                interrupts = <18>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                status = "disabled";
                compatible = "generic-ohci";
                reg = <0x101c1000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;
index b572f2a..b5edf50 100644 (file)
@@ -33,7 +33,7 @@
                #size-cells = <1>;
 
                sysc: sysc@0 {
-                       compatible = "ralink,mt7620a-sysc";
+                       compatible = "ralink,mt7620a-sysc", "syscon";
                        reg = <0x0 0x100>;
                };
 
        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>;
                compatible = "generic-ehci";
                reg = <0x101c0000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;
                compatible = "generic-ohci";
                reg = <0x101c1000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;
index 5c69d28..bd51838 100644 (file)
@@ -34,7 +34,7 @@
                #size-cells = <1>;
 
                sysc: sysc@0 {
-                       compatible = "ralink,rt3050-sysc";
+                       compatible = "ralink,rt3050-sysc", "syscon";
                        reg = <0x0 0x100>;
                };
 
 
        usbphy: usbphy {
                compatible = "ralink,rt3050-usbphy";
+               #phy-cells = <0>;
+
+               ralink,sysctl = <&sysc>;
                resets = <&rstctrl 22>;
                reset-names = "host";
                clocks = <&clkctrl 18>;
index 5612458..e6e49ee 100644 (file)
@@ -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>;
                };
 
 
        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>;
                compatible = "generic-ehci";
                reg = <0x101c0000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;
                compatible = "generic-ohci";
                reg = <0x101c1000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;
index 64bc56b..193a3ee 100644 (file)
@@ -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>;
                };
 
 
        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>;
                compatible = "generic-ehci";
                reg = <0x101c0000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;
                compatible = "generic-ohci";
                reg = <0x101c1000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;
index a92c113..843ea30 100644 (file)
@@ -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>;
                };
 
 
        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>;
                compatible = "generic-ehci";
                reg = <0x101c0000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;
                compatible = "generic-ohci";
                reg = <0x101c1000 0x1000>;
 
-               phys = <&usbphy 1>;
+               phys = <&usbphy>;
                phy-names = "usb";
 
                interrupt-parent = <&intc>;