From f022de6275a69c3333d759db880d9770f48aff35 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Thu, 13 Dec 2018 12:38:33 -0600 Subject: [PATCH] dts: stm32: Move usb PHY nodes out of SoC to fix warning We currently get a number of warnings like: Warning (simple_bus_reg): /soc/otgfs_phy: missing or empty reg/ranges property This is due to the usb phy nodes not have a reg property since they don't have an mmio address associated with them. Move the phy nodes out of the SoC node so their lack of a reg property will not cause a warning. This is similar to how Linux dts files handle the phy nodes. Signed-off-by: Kumar Gala --- dts/arm/st/f0/stm32f070.dtsi | 12 ++++++------ dts/arm/st/f0/stm32f072.dtsi | 12 ++++++------ dts/arm/st/f1/stm32f103X8.dtsi | 12 ++++++------ dts/arm/st/f1/stm32f103Xb.dtsi | 12 ++++++------ dts/arm/st/f2/stm32f2.dtsi | 12 ++++++------ dts/arm/st/f3/stm32f3.dtsi | 12 ++++++------ dts/arm/st/f4/stm32f4.dtsi | 12 ++++++------ dts/arm/st/f4/stm32f405.dtsi | 12 ++++++------ dts/arm/st/f4/stm32f446.dtsi | 12 ++++++------ dts/arm/st/f7/stm32f7.dtsi | 24 ++++++++++++------------ dts/arm/st/l0/stm32l072.dtsi | 12 ++++++------ dts/arm/st/l0/stm32l073.dtsi | 12 ++++++------ dts/arm/st/l4/stm32l432.dtsi | 12 ++++++------ dts/arm/st/l4/stm32l475.dtsi | 12 ++++++------ dts/arm/st/l4/stm32l4r5.dtsi | 12 ++++++------ 15 files changed, 96 insertions(+), 96 deletions(-) diff --git a/dts/arm/st/f0/stm32f070.dtsi b/dts/arm/st/f0/stm32f070.dtsi index d7d437ce67c..3ded21b80a4 100644 --- a/dts/arm/st/f0/stm32f070.dtsi +++ b/dts/arm/st/f0/stm32f070.dtsi @@ -19,12 +19,6 @@ label = "SPI_2"; }; - usb_fs_phy: usbphy { - compatible = "usb-nop-xceiv"; - #phy-cells = <0>; - label = "USB_FS_PHY"; - }; - usb: usb@40005c00 { compatible = "st,stm32-usb"; reg = <0x40005c00 0x400>; @@ -37,4 +31,10 @@ label= "USB"; }; }; + + usb_fs_phy: usbphy { + compatible = "usb-nop-xceiv"; + #phy-cells = <0>; + label = "USB_FS_PHY"; + }; }; diff --git a/dts/arm/st/f0/stm32f072.dtsi b/dts/arm/st/f0/stm32f072.dtsi index 02aba0e8af2..de585d6cf89 100644 --- a/dts/arm/st/f0/stm32f072.dtsi +++ b/dts/arm/st/f0/stm32f072.dtsi @@ -47,12 +47,6 @@ label = "SPI_2"; }; - usb_fs_phy: usbphy { - compatible = "usb-nop-xceiv"; - #phy-cells = <0>; - label = "USB_FS_PHY"; - }; - usb: usb@40005c00 { compatible = "st,stm32-usb"; reg = <0x40005c00 0x400>; @@ -80,4 +74,10 @@ phase_seg2 = <6>; }; }; + + usb_fs_phy: usbphy { + compatible = "usb-nop-xceiv"; + #phy-cells = <0>; + label = "USB_FS_PHY"; + }; }; diff --git a/dts/arm/st/f1/stm32f103X8.dtsi b/dts/arm/st/f1/stm32f103X8.dtsi index 8f62ffcdb83..57a5ae13a44 100644 --- a/dts/arm/st/f1/stm32f103X8.dtsi +++ b/dts/arm/st/f1/stm32f103X8.dtsi @@ -31,12 +31,6 @@ label = "SPI_2"; }; - usb_fs_phy: usbphy { - compatible = "usb-nop-xceiv"; - #phy-cells = <0>; - label = "USB_FS_PHY"; - }; - usb: usb@40005c00 { compatible = "st,stm32-usb"; reg = <0x40005c00 0x400>; @@ -49,4 +43,10 @@ label= "USB"; }; }; + + usb_fs_phy: usbphy { + compatible = "usb-nop-xceiv"; + #phy-cells = <0>; + label = "USB_FS_PHY"; + }; }; diff --git a/dts/arm/st/f1/stm32f103Xb.dtsi b/dts/arm/st/f1/stm32f103Xb.dtsi index 65491951a63..87e698054dc 100644 --- a/dts/arm/st/f1/stm32f103Xb.dtsi +++ b/dts/arm/st/f1/stm32f103Xb.dtsi @@ -33,12 +33,6 @@ label = "SPI_2"; }; - usb_fs_phy: usbphy { - compatible = "usb-nop-xceiv"; - #phy-cells = <0>; - label = "USB_FS_PHY"; - }; - usb: usb@40005c00 { compatible = "st,stm32-usb"; reg = <0x40005c00 0x400>; @@ -51,4 +45,10 @@ label= "USB"; }; }; + + usb_fs_phy: usbphy { + compatible = "usb-nop-xceiv"; + #phy-cells = <0>; + label = "USB_FS_PHY"; + }; }; diff --git a/dts/arm/st/f2/stm32f2.dtsi b/dts/arm/st/f2/stm32f2.dtsi index 64c2cc21760..40e76dd719e 100644 --- a/dts/arm/st/f2/stm32f2.dtsi +++ b/dts/arm/st/f2/stm32f2.dtsi @@ -194,12 +194,6 @@ label = "UART_5"; }; - otgfs_phy: otgfs_phy { - compatible = "usb-nop-xceiv"; - #phy-cells = <0>; - label = "OTGFS_PHY"; - }; - usbotg_fs: usb@50000000 { compatible = "st,stm32-otgfs"; reg = <0x50000000 0x40000>; @@ -213,6 +207,12 @@ label = "OTGFS"; }; }; + + otgfs_phy: otgfs_phy { + compatible = "usb-nop-xceiv"; + #phy-cells = <0>; + label = "OTGFS_PHY"; + }; }; &nvic { diff --git a/dts/arm/st/f3/stm32f3.dtsi b/dts/arm/st/f3/stm32f3.dtsi index f590bbb4a8e..4ae67fc052f 100644 --- a/dts/arm/st/f3/stm32f3.dtsi +++ b/dts/arm/st/f3/stm32f3.dtsi @@ -154,12 +154,6 @@ label = "SPI_1"; }; - usb_fs_phy: usbphy { - compatible = "usb-nop-xceiv"; - #phy-cells = <0>; - label = "USB_FS_PHY"; - }; - usb: usb@40005c00 { compatible = "st,stm32-usb"; reg = <0x40005c00 0x400>; @@ -293,6 +287,12 @@ label = "RTC_0"; }; }; + + usb_fs_phy: usbphy { + compatible = "usb-nop-xceiv"; + #phy-cells = <0>; + label = "USB_FS_PHY"; + }; }; &nvic { diff --git a/dts/arm/st/f4/stm32f4.dtsi b/dts/arm/st/f4/stm32f4.dtsi index c97786b25ce..a6eef81f878 100644 --- a/dts/arm/st/f4/stm32f4.dtsi +++ b/dts/arm/st/f4/stm32f4.dtsi @@ -210,12 +210,6 @@ label = "I2S_1"; }; - otgfs_phy: otgfs_phy { - compatible = "usb-nop-xceiv"; - #phy-cells = <0>; - label = "OTGFS_PHY"; - }; - usbotg_fs: usb@50000000 { compatible = "st,stm32-otgfs"; reg = <0x50000000 0x40000>; @@ -366,6 +360,12 @@ label = "RTC_0"; }; }; + + otgfs_phy: otgfs_phy { + compatible = "usb-nop-xceiv"; + #phy-cells = <0>; + label = "OTGFS_PHY"; + }; }; &nvic { diff --git a/dts/arm/st/f4/stm32f405.dtsi b/dts/arm/st/f4/stm32f405.dtsi index ae356a12fbd..2bec087126e 100644 --- a/dts/arm/st/f4/stm32f405.dtsi +++ b/dts/arm/st/f4/stm32f405.dtsi @@ -163,12 +163,6 @@ }; }; - otghs_fs_phy: otghs_fs_phy { - compatible = "usb-nop-xceiv"; - #phy-cells = <0>; - label = "OTGHS_FS_PHY"; - }; - usbotg_hs: usb@40040000 { compatible = "st,stm32-otghs", "st,stm32-otgfs"; reg = <0x40040000 0x40000>; @@ -182,4 +176,10 @@ label= "OTGHS"; }; }; + + otghs_fs_phy: otghs_fs_phy { + compatible = "usb-nop-xceiv"; + #phy-cells = <0>; + label = "OTGHS_FS_PHY"; + }; }; diff --git a/dts/arm/st/f4/stm32f446.dtsi b/dts/arm/st/f4/stm32f446.dtsi index 63648f9add7..e7c922fd96b 100644 --- a/dts/arm/st/f4/stm32f446.dtsi +++ b/dts/arm/st/f4/stm32f446.dtsi @@ -12,12 +12,6 @@ num-bidir-endpoints = <6>; }; - otghs_fs_phy: otghs_fs_phy { - compatible = "usb-nop-xceiv"; - #phy-cells = <0>; - label = "OTGHS_FS_PHY"; - }; - usbotg_hs: usb@40040000 { compatible = "st,stm32-otghs", "st,stm32-otgfs"; reg = <0x40040000 0x40000>; @@ -31,4 +25,10 @@ label= "OTGHS"; }; }; + + otghs_fs_phy: otghs_fs_phy { + compatible = "usb-nop-xceiv"; + #phy-cells = <0>; + label = "OTGHS_FS_PHY"; + }; }; diff --git a/dts/arm/st/f7/stm32f7.dtsi b/dts/arm/st/f7/stm32f7.dtsi index a49a087415a..39c2c30c363 100644 --- a/dts/arm/st/f7/stm32f7.dtsi +++ b/dts/arm/st/f7/stm32f7.dtsi @@ -531,12 +531,6 @@ }; }; - otgfs_phy: otgfs_phy { - compatible = "usb-nop-xceiv"; - #phy-cells = <0>; - label = "OTGFS_PHY"; - }; - usbotg_fs: usb@50000000 { compatible = "st,stm32-otgfs"; reg = <0x50000000 0x40000>; @@ -550,12 +544,6 @@ label = "OTGFS"; }; - otghs_fs_phy: otghs_fs_phy { - compatible = "usb-nop-xceiv"; - #phy-cells = <0>; - label = "OTGHS_FS_PHY"; - }; - usbotg_hs: usb@40040000 { compatible = "st,stm32-otghs", "st,stm32-otgfs"; reg = <0x40040000 0x40000>; @@ -578,6 +566,18 @@ label = "RTC_0"; }; }; + + otghs_fs_phy: otghs_fs_phy { + compatible = "usb-nop-xceiv"; + #phy-cells = <0>; + label = "OTGHS_FS_PHY"; + }; + + otgfs_phy: otgfs_phy { + compatible = "usb-nop-xceiv"; + #phy-cells = <0>; + label = "OTGFS_PHY"; + }; }; &nvic { diff --git a/dts/arm/st/l0/stm32l072.dtsi b/dts/arm/st/l0/stm32l072.dtsi index 1715789bdfb..b539192caea 100644 --- a/dts/arm/st/l0/stm32l072.dtsi +++ b/dts/arm/st/l0/stm32l072.dtsi @@ -57,12 +57,6 @@ label = "SPI_2"; }; - otgfs_phy: otgfs_phy { - compatible = "usb-nop-xceiv"; - #phy-cells = <0>; - label = "OTGFS_PHY"; - }; - usb: usb@40005c00 { compatible = "st,stm32-usb"; reg = <0x40005c00 0x400>; @@ -75,4 +69,10 @@ label= "USB"; }; }; + + otgfs_phy: otgfs_phy { + compatible = "usb-nop-xceiv"; + #phy-cells = <0>; + label = "OTGFS_PHY"; + }; }; diff --git a/dts/arm/st/l0/stm32l073.dtsi b/dts/arm/st/l0/stm32l073.dtsi index c9a522a6527..ffd52a82e44 100644 --- a/dts/arm/st/l0/stm32l073.dtsi +++ b/dts/arm/st/l0/stm32l073.dtsi @@ -56,12 +56,6 @@ label = "SPI_2"; }; - otgfs_phy: otgfs_phy { - compatible = "usb-nop-xceiv"; - #phy-cells = <0>; - label = "OTGFS_PHY"; - }; - usb: usb@40005c00 { compatible = "st,stm32-usb"; reg = <0x40005c00 0x400>; @@ -74,4 +68,10 @@ label= "USB"; }; }; + + otgfs_phy: otgfs_phy { + compatible = "usb-nop-xceiv"; + #phy-cells = <0>; + label = "OTGFS_PHY"; + }; }; diff --git a/dts/arm/st/l4/stm32l432.dtsi b/dts/arm/st/l4/stm32l432.dtsi index 55be4a0a7ff..da426171140 100644 --- a/dts/arm/st/l4/stm32l432.dtsi +++ b/dts/arm/st/l4/stm32l432.dtsi @@ -8,12 +8,6 @@ / { soc { - otgfs_phy: otgfs_phy { - compatible = "usb-nop-xceiv"; - #phy-cells = <0>; - label = "OTGFS_PHY"; - }; - usb: usb@40006800 { compatible = "st,stm32-usb"; reg = <0x40006800 0x40000>; @@ -26,4 +20,10 @@ label = "USB"; }; }; + + otgfs_phy: otgfs_phy { + compatible = "usb-nop-xceiv"; + #phy-cells = <0>; + label = "OTGFS_PHY"; + }; }; diff --git a/dts/arm/st/l4/stm32l475.dtsi b/dts/arm/st/l4/stm32l475.dtsi index 3e14166573b..e6e6a904356 100644 --- a/dts/arm/st/l4/stm32l475.dtsi +++ b/dts/arm/st/l4/stm32l475.dtsi @@ -8,12 +8,6 @@ / { soc { - otgfs_phy: otgfs_phy { - compatible = "usb-nop-xceiv"; - #phy-cells = <0>; - label = "OTGFS_PHY"; - }; - usbotg_fs: otgfs@50000000 { compatible = "st,stm32-otgfs"; reg = <0x50000000 0x40000>; @@ -27,4 +21,10 @@ label= "OTGFS"; }; }; + + otgfs_phy: otgfs_phy { + compatible = "usb-nop-xceiv"; + #phy-cells = <0>; + label = "OTGFS_PHY"; + }; }; diff --git a/dts/arm/st/l4/stm32l4r5.dtsi b/dts/arm/st/l4/stm32l4r5.dtsi index 9b422e2f634..4b7dcd52cb0 100644 --- a/dts/arm/st/l4/stm32l4r5.dtsi +++ b/dts/arm/st/l4/stm32l4r5.dtsi @@ -118,12 +118,6 @@ label = "SPI_3"; }; - otgfs_phy: otgfs_phy { - compatible = "usb-nop-xceiv"; - #phy-cells = <0>; - label = "OTGFS_PHY"; - }; - usbotg_fs: otgfs@50000000 { compatible = "st,stm32-otgfs"; reg = <0x50000000 0x40000>; @@ -137,4 +131,10 @@ label= "OTGFS"; }; }; + + otgfs_phy: otgfs_phy { + compatible = "usb-nop-xceiv"; + #phy-cells = <0>; + label = "OTGFS_PHY"; + }; };