ARM: dts: s5pv210: Use standard arrays of generic PHYs for EHCI/OHCI device

Move USB PHYs to a standard arrays for S5PV210 EHCI/OHCI devices. This
resolves the conflict between S5PV210 EHCI/OHCI sub-nodes and generic USB
device bindings.

Suggested-by: Måns Rullgård <mans@mansr.com>
Suggested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220314181948.246434-3-krzysztof.kozlowski@canonical.com

diff --git a/arch/arm/boot/dts/s5pv210.dtsi b/arch/arm/boot/dts/s5pv210.dtsi
index a7aca54..4ea1e63 100644 (file)
--- a/arch/arm/boot/dts/s5pv210.dtsi
+++ b/arch/arm/boot/dts/s5pv210.dtsi
@@ -434,14 +434,9 @@
                        interrupt-parent = <&vic1>;
                        clocks = <&clocks CLK_USB_HOST>;
                        clock-names = "usbhost";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+                       phys = <&usbphy 1>;
+                       phy-names = "host";
                        status = "disabled";
-
-                       port@0 {
-                               reg = <0>;
-                               phys = <&usbphy 1>;
-                       };
                };
 
                ohci: usb@ec300000 {
@@ -451,14 +446,9 @@
                        interrupt-parent = <&vic1>;
                        clocks = <&clocks CLK_USB_HOST>;
                        clock-names = "usbhost";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+                       phys = <&usbphy 1>;
+                       phy-names = "host";
                        status = "disabled";
-
-                       port@0 {
-                               reg = <0>;
-                               phys = <&usbphy 1>;
-                       };
                };
 
                mfc: codec@f1700000 {