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>
#size-cells = <1>;
sysc: sysc@0 {
#size-cells = <1>;
sysc: sysc@0 {
- compatible = "ralink,mt7620a-sysc", "ralink,rt3050-sysc";
+ compatible = "ralink,mt7620a-sysc", "ralink,rt3050-sysc", "syscon";
usbphy: usbphy {
compatible = "mediatek,mt7620-usbphy";
usbphy: usbphy {
compatible = "mediatek,mt7620-usbphy";
+ ralink,sysctl = <&sysc>;
resets = <&rstctrl 22 &rstctrl 25>;
reset-names = "host", "device";
resets = <&rstctrl 22 &rstctrl 25>;
reset-names = "host", "device";
interrupt-parent = <&intc>;
interrupts = <18>;
interrupt-parent = <&intc>;
interrupts = <18>;
phy-names = "usb";
status = "disabled";
phy-names = "usb";
status = "disabled";
interrupt-parent = <&intc>;
interrupts = <18>;
interrupt-parent = <&intc>;
interrupts = <18>;
phy-names = "usb";
status = "disabled";
phy-names = "usb";
status = "disabled";
#size-cells = <1>;
sysc: sysc@0 {
#size-cells = <1>;
sysc: sysc@0 {
- compatible = "ralink,mt7620a-sysc", "ralink,rt3050-sysc";
+ compatible = "ralink,mt7620a-sysc", "ralink,rt3050-sysc", "syscon";
usbphy: usbphy {
compatible = "mediatek,mt7620-usbphy";
usbphy: usbphy {
compatible = "mediatek,mt7620-usbphy";
+ ralink,sysctl = <&sysc>;
resets = <&rstctrl 22 &rstctrl 25>;
reset-names = "host", "device";
resets = <&rstctrl 22 &rstctrl 25>;
reset-names = "host", "device";
interrupt-parent = <&intc>;
interrupts = <18>;
interrupt-parent = <&intc>;
interrupts = <18>;
phy-names = "usb";
status = "disabled";
phy-names = "usb";
status = "disabled";
compatible = "generic-ohci";
reg = <0x101c1000 0x1000>;
compatible = "generic-ohci";
reg = <0x101c1000 0x1000>;
phy-names = "usb";
interrupt-parent = <&intc>;
phy-names = "usb";
interrupt-parent = <&intc>;
#size-cells = <1>;
sysc: sysc@0 {
#size-cells = <1>;
sysc: sysc@0 {
- compatible = "ralink,mt7620a-sysc";
+ compatible = "ralink,mt7620a-sysc", "syscon";
usbphy: usbphy@10120000 {
compatible = "ralink,mt7628an-usbphy", "mediatek,mt7620-usbphy";
reg = <0x10120000 0x1000>;
usbphy: usbphy@10120000 {
compatible = "ralink,mt7628an-usbphy", "mediatek,mt7620-usbphy";
reg = <0x10120000 0x1000>;
+ ralink,sysctl = <&sysc>;
resets = <&rstctrl 22 &rstctrl 25>;
reset-names = "host", "device";
clocks = <&clkctrl 22 &clkctrl 25>;
resets = <&rstctrl 22 &rstctrl 25>;
reset-names = "host", "device";
clocks = <&clkctrl 22 &clkctrl 25>;
compatible = "generic-ehci";
reg = <0x101c0000 0x1000>;
compatible = "generic-ehci";
reg = <0x101c0000 0x1000>;
phy-names = "usb";
interrupt-parent = <&intc>;
phy-names = "usb";
interrupt-parent = <&intc>;
compatible = "generic-ohci";
reg = <0x101c1000 0x1000>;
compatible = "generic-ohci";
reg = <0x101c1000 0x1000>;
phy-names = "usb";
interrupt-parent = <&intc>;
phy-names = "usb";
interrupt-parent = <&intc>;
#size-cells = <1>;
sysc: sysc@0 {
#size-cells = <1>;
sysc: sysc@0 {
- compatible = "ralink,rt3050-sysc";
+ compatible = "ralink,rt3050-sysc", "syscon";
usbphy: usbphy {
compatible = "ralink,rt3050-usbphy";
usbphy: usbphy {
compatible = "ralink,rt3050-usbphy";
+ #phy-cells = <0>;
+
+ ralink,sysctl = <&sysc>;
resets = <&rstctrl 22>;
reset-names = "host";
clocks = <&clkctrl 18>;
resets = <&rstctrl 22>;
reset-names = "host";
clocks = <&clkctrl 18>;
#size-cells = <1>;
sysc: sysc@0 {
#size-cells = <1>;
sysc: sysc@0 {
- compatible = "ralink,rt3352-sysc", "ralink,rt3050-sysc";
+ compatible = "ralink,rt3352-sysc", "ralink,rt3050-sysc", "syscon";
usbphy: usbphy {
compatible = "ralink,rt3352-usbphy";
usbphy: usbphy {
compatible = "ralink,rt3352-usbphy";
+ ralink,sysctl = <&sysc>;
resets = <&rstctrl 22 &rstctrl 25>;
reset-names = "host", "device";
clocks = <&clkctrl 18 &clkctrl 20>;
resets = <&rstctrl 22 &rstctrl 25>;
reset-names = "host", "device";
clocks = <&clkctrl 18 &clkctrl 20>;
compatible = "generic-ehci";
reg = <0x101c0000 0x1000>;
compatible = "generic-ehci";
reg = <0x101c0000 0x1000>;
phy-names = "usb";
interrupt-parent = <&intc>;
phy-names = "usb";
interrupt-parent = <&intc>;
compatible = "generic-ohci";
reg = <0x101c1000 0x1000>;
compatible = "generic-ohci";
reg = <0x101c1000 0x1000>;
phy-names = "usb";
interrupt-parent = <&intc>;
phy-names = "usb";
interrupt-parent = <&intc>;
#size-cells = <1>;
sysc: sysc@0 {
#size-cells = <1>;
sysc: sysc@0 {
- compatible = "ralink,rt3883-sysc", "ralink,rt3050-sysc";
+ compatible = "ralink,rt3883-sysc", "ralink,rt3050-sysc", "syscon";
usbphy: usbphy {
compatible = "ralink,rt3352-usbphy";
usbphy: usbphy {
compatible = "ralink,rt3352-usbphy";
+ ralink,sysctl = <&sysc>;
resets = <&rstctrl 22 &rstctrl 25>;
reset-names = "host", "device";
clocks = <&clkctrl 22 &clkctrl 25>;
resets = <&rstctrl 22 &rstctrl 25>;
reset-names = "host", "device";
clocks = <&clkctrl 22 &clkctrl 25>;
compatible = "generic-ehci";
reg = <0x101c0000 0x1000>;
compatible = "generic-ehci";
reg = <0x101c0000 0x1000>;
phy-names = "usb";
interrupt-parent = <&intc>;
phy-names = "usb";
interrupt-parent = <&intc>;
compatible = "generic-ohci";
reg = <0x101c1000 0x1000>;
compatible = "generic-ohci";
reg = <0x101c1000 0x1000>;
phy-names = "usb";
interrupt-parent = <&intc>;
phy-names = "usb";
interrupt-parent = <&intc>;
#size-cells = <1>;
sysc: sysc@0 {
#size-cells = <1>;
sysc: sysc@0 {
- compatible = "ralink,rt5350-sysc", "ralink,rt3050-sysc";
+ compatible = "ralink,rt5350-sysc", "ralink,rt3050-sysc", "syscon";
usbphy: usbphy {
compatible = "ralink,rt3352-usbphy";
usbphy: usbphy {
compatible = "ralink,rt3352-usbphy";
+ ralink,sysctl = <&sysc>;
resets = <&rstctrl 22 &rstctrl 25>;
reset-names = "host", "device";
clocks = <&clkctrl 18>;
resets = <&rstctrl 22 &rstctrl 25>;
reset-names = "host", "device";
clocks = <&clkctrl 18>;
compatible = "generic-ehci";
reg = <0x101c0000 0x1000>;
compatible = "generic-ehci";
reg = <0x101c0000 0x1000>;
phy-names = "usb";
interrupt-parent = <&intc>;
phy-names = "usb";
interrupt-parent = <&intc>;
compatible = "generic-ohci";
reg = <0x101c1000 0x1000>;
compatible = "generic-ohci";
reg = <0x101c1000 0x1000>;
phy-names = "usb";
interrupt-parent = <&intc>;
phy-names = "usb";
interrupt-parent = <&intc>;