ARM: dts: sti: move usb picophy nodes out of soc in stih410.dtsi

Move the usb2_picophy1 and usb2_picophy2 nodes out of the soc section.
Since they are controlled via syscfg, there is no reg property needed,
which is required when having the node within the soc section.

Modification is done within stih410.dtsi and within related board
dts files (stih410-b2120.dts, stih410-b2260.dts).

Signed-off-by: Alain Volmat <avolmat@me.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>

diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts
index 9d3b118f5f0f06de01f6b9ccfd96600b22ccbfe4..538ff98ca1b1b6542f98a18f68968f030b8c55c0 100644 (file)
--- a/arch/arm/boot/dts/stih410-b2120.dts
+++ b/arch/arm/boot/dts/stih410-b2120.dts
@@ -24,6 +24,14 @@
                ethernet0 = &ethernet0;
        };
 
+       usb2_picophy1: phy2 {
+               status = "okay";
+       };
+
+       usb2_picophy2: phy3 {
+               status = "okay";
+       };
+
        soc {
 
                mmc0: sdhci@9060000 {
@@ -33,14 +41,6 @@
                        sd-uhs-ddr50;
                };
 
-               usb2_picophy1: phy2@0 {
-                       status = "okay";
-               };
-
-               usb2_picophy2: phy3@0 {
-                       status = "okay";
-               };
-
                ohci0: usb@9a03c00 {
                        status = "okay";
                };

diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts
index c2d3b6de55d0b3ecbf3b7fdbc55ee744f16f0dab..26d93f26f6d0754eac0d8a2344403f8472d0f8a2 100644 (file)
--- a/arch/arm/boot/dts/stih410-b2260.dts
+++ b/arch/arm/boot/dts/stih410-b2260.dts
@@ -82,6 +82,14 @@
                };
        };
 
+       usb2_picophy1: phy2 {
+               status = "okay";
+       };
+
+       usb2_picophy2: phy3 {
+               status = "okay";
+       };
+
        soc {
                /* Low speed expansion connector */
                uart0: serial@9830000 {
@@ -152,14 +160,6 @@
                        status = "okay";
                };
 
-               usb2_picophy1: phy2@0 {
-                       status = "okay";
-               };
-
-               usb2_picophy2: phy3@0 {
-                       status = "okay";
-               };
-
                ohci0: usb@9a03c00 {
                        status = "okay";
                };

diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi
index fe83d9a522bf8de280104ec0173b008ec27599eb..ce2f62cf129bed020dd6c38f91f4ed877b62821c 100644 (file)
--- a/arch/arm/boot/dts/stih410.dtsi
+++ b/arch/arm/boot/dts/stih410.dtsi
@@ -12,31 +12,29 @@
                bdisp0 = &bdisp0;
        };
 
-       soc {
-               usb2_picophy1: phy2@0 {
-                       compatible = "st,stih407-usb2-phy";
-                       reg = <0 0>;
-                       #phy-cells = <0>;
-                       st,syscfg = <&syscfg_core 0xf8 0xf4>;
-                       resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
-                                <&picophyreset STIH407_PICOPHY0_RESET>;
-                       reset-names = "global", "port";
+       usb2_picophy1: phy2 {
+               compatible = "st,stih407-usb2-phy";
+               #phy-cells = <0>;
+               st,syscfg = <&syscfg_core 0xf8 0xf4>;
+               resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
+                        <&picophyreset STIH407_PICOPHY0_RESET>;
+               reset-names = "global", "port";
+
+               status = "disabled";
+       };
 
-                       status = "disabled";
-               };
+       usb2_picophy2: phy3 {
+               compatible = "st,stih407-usb2-phy";
+               #phy-cells = <0>;
+               st,syscfg = <&syscfg_core 0xfc 0xf4>;
+               resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
+                        <&picophyreset STIH407_PICOPHY1_RESET>;
+               reset-names = "global", "port";
 
-               usb2_picophy2: phy3@0 {
-                       compatible = "st,stih407-usb2-phy";
-                       reg = <0 0>;
-                       #phy-cells = <0>;
-                       st,syscfg = <&syscfg_core 0xfc 0xf4>;
-                       resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
-                                <&picophyreset STIH407_PICOPHY1_RESET>;
-                       reset-names = "global", "port";
-
-                       status = "disabled";
-               };
+               status = "disabled";
+       };
 
+       soc {
                ohci0: usb@9a03c00 {
                        compatible = "st,st-ohci-300x";
                        reg = <0x9a03c00 0x100>;