ARM: dts: exynos: Use standard arrays of generic PHYs for EHCI/OHCI devices

Move USB PHYs to a standard arrays for Exynos EHCI/OHCI devices. This
resolves the conflict between Exynos EHCI/OHCI sub-nodes and generic USB
device bindings. Once the Exynos EHCI/OHCI sub-nodes are removed, the
boards can finally provide sub-nodes for the USB devices using generic USB
device bindings.

Suggested-by: Måns Rullgård <mans@mansr.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20190726081453.9456-4-m.szyprowski@samsung.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 1264cc4..433f109 100644 (file)
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -380,23 +380,8 @@
                        clocks = <&clock CLK_USB_HOST>;
                        clock-names = "usbhost";
                        status = "disabled";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       port@0 {
-                               reg = <0>;
-                               phys = <&exynos_usbphy 1>;
-                               status = "disabled";
-                       };
-                       port@1 {
-                               reg = <1>;
-                               phys = <&exynos_usbphy 2>;
-                               status = "disabled";
-                       };
-                       port@2 {
-                               reg = <2>;
-                               phys = <&exynos_usbphy 3>;
-                               status = "disabled";
-                       };
+                       phys = <&exynos_usbphy 1>, <&exynos_usbphy 2>, <&exynos_usbphy 3>;
+                       phy-names = "host", "hsic0", "hsic1";
                };
 
                ohci: ohci@12590000 {
@@ -406,13 +391,8 @@
                        clocks = <&clock CLK_USB_HOST>;
                        clock-names = "usbhost";
                        status = "disabled";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       port@0 {
-                               reg = <0>;
-                               phys = <&exynos_usbphy 1>;
-                               status = "disabled";
-                       };
+                       phys = <&exynos_usbphy 1>;
+                       phy-names = "host";
                };
 
                gpu: gpu@13000000 {

diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index 82a8b54..09d3d54 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
@@ -204,9 +204,8 @@
 
 &ehci {
        status = "okay";
-       port@0 {
-               status = "okay";
-       };
+       phys = <&exynos_usbphy 1>;
+       phy-names = "host";
 };
 
 &exynos_usbphy {
@@ -520,9 +519,6 @@
 
 &ohci {
        status = "okay";
-       port@0 {
-               status = "okay";
-       };
 };
 
 &pinctrl_1 {

diff --git a/arch/arm/boot/dts/exynos4412-itop-elite.dts b/arch/arm/boot/dts/exynos4412-itop-elite.dts
index 0dedeba..f6d0a5f 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-itop-elite.dts
+++ b/arch/arm/boot/dts/exynos4412-itop-elite.dts
@@ -146,13 +146,8 @@
        /* In order to reset USB ethernet */
        samsung,vbus-gpio = <&gpc0 1 GPIO_ACTIVE_HIGH>;
 
-       port@0 {
-               status = "okay";
-       };
-
-       port@2 {
-               status = "okay";
-       };
+       phys = <&exynos_usbphy 1>, <&exynos_usbphy 3>;
+       phy-names = "host", "hsic1";
 };
 
 &exynos_usbphy {

diff --git a/arch/arm/boot/dts/exynos4412-odroidu3.dts b/arch/arm/boot/dts/exynos4412-odroidu3.dts
index 96d9988..8ff243b 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroidu3.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidu3.dts
@@ -105,12 +105,8 @@
 };
 
 &ehci {
-       port@1 {
-               status = "okay";
-       };
-       port@2 {
-               status = "okay";
-       };
+       phys = <&exynos_usbphy 2>, <&exynos_usbphy 3>;
+       phy-names = "hsic0", "hsic1";
 };
 
 &sound {

diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
index a225158..3ea2a01 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroidx.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
@@ -72,9 +72,8 @@
 };
 
 &ehci {
-       port@1 {
-               status = "okay";
-       };
+       phys = <&exynos_usbphy 2>;
+       phy-names = "hsic0";
 };
 
 &mshc_0 {

diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index 698de43..ecd14b2 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -88,13 +88,8 @@
 &ehci {
        samsung,vbus-gpio = <&gpx3 5 1>;
        status = "okay";
-
-       port@1 {
-               status = "okay";
-       };
-       port@2 {
-               status = "okay";
-       };
+       phys = <&exynos_usbphy 2>, <&exynos_usbphy 3>;
+       phy-names = "hsic0", "hsic1";
 };
 
 &fimd {

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index d5e0392..c5584f4 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -617,12 +617,8 @@
 
                        clocks = <&clock CLK_USB2>;
                        clock-names = "usbhost";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       port@0 {
-                               reg = <0>;
-                               phys = <&usb2_phy_gen 1>;
-                       };
+                       phys = <&usb2_phy_gen 1>;
+                       phy-names = "host";
                };
 
                ohci: usb@12120000 {
@@ -632,12 +628,8 @@
 
                        clocks = <&clock CLK_USB2>;
                        clock-names = "usbhost";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       port@0 {
-                               reg = <0>;
-                               phys = <&usb2_phy_gen 1>;
-                       };
+                       phys = <&usb2_phy_gen 1>;
+                       phy-names = "host";
                };
 
                usb2_phy_gen: phy@12130000 {

diff --git a/arch/arm/boot/dts/exynos54xx.dtsi b/arch/arm/boot/dts/exynos54xx.dtsi
index 0b27beb..9c3b63b 100644 (file)
--- a/arch/arm/boot/dts/exynos54xx.dtsi
+++ b/arch/arm/boot/dts/exynos54xx.dtsi
@@ -189,26 +189,16 @@
                        compatible = "samsung,exynos4210-ehci";
                        reg = <0x12110000 0x100>;
                        interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
-
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       port@0 {
-                               reg = <0>;
-                               phys = <&usb2_phy 1>;
-                       };
+                       phys = <&usb2_phy 1>;
+                       phy-names = "host";
                };
 
                usbhost1: usb@12120000 {
                        compatible = "samsung,exynos4210-ohci";
                        reg = <0x12120000 0x100>;
                        interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
-
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       port@0 {
-                               reg = <0>;
-                               phys = <&usb2_phy 1>;
-                       };
+                       phys = <&usb2_phy 1>;
+                       phy-names = "host";
                };
 
                usb2_phy: phy@12130000 {