ARM: STi: STiH407: Move PWM nodes STiH407 => STiH407-family

This also incorporates the STiH410.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>

diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index 626452f58aff536dc00eb528c11aa900fded97e4..b9b8eccceed724fcde307a34fb455f4b9a00f1e4 100644 (file)
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -543,6 +543,7 @@
                        status = "disabled";
                };
 
+
                st_dwc3: dwc3@8f94000 {
                        compatible      = "st,stih407-dwc3";
                        reg             = <0x08f94000 0x1000>, <0x110 0x4>;
@@ -569,5 +570,34 @@
                                                  <&phy_port2 PHY_TYPE_USB3>;
                        };
                };
+
+               /* COMMS PWM Module */
+               pwm0: pwm@9810000 {
+                       compatible      = "st,sti-pwm";
+                       status          = "okay";
+                       #pwm-cells      = <2>;
+                       reg             = <0x9810000 0x68>;
+                       pinctrl-names   = "default";
+                       pinctrl-0       = <&pinctrl_pwm0_chan0_default>;
+                       clock-names     = "pwm";
+                       clocks          = <&clk_sysin>;
+                       st,pwm-num-chan = <1>;
+               };
+
+               /* SBC PWM Module */
+               pwm1: pwm@9510000 {
+                       compatible      = "st,sti-pwm";
+                       status          = "okay";
+                       #pwm-cells      = <2>;
+                       reg             = <0x9510000 0x68>;
+                       pinctrl-names   = "default";
+                       pinctrl-0       = <&pinctrl_pwm1_chan0_default
+                                       &pinctrl_pwm1_chan1_default
+                                       &pinctrl_pwm1_chan2_default
+                                       &pinctrl_pwm1_chan3_default>;
+                       clock-names     = "pwm";
+                       clocks          = <&clk_sysin>;
+                       st,pwm-num-chan = <4>;
+               };
        };
 };

diff --git a/arch/arm/boot/dts/stih407.dtsi b/arch/arm/boot/dts/stih407.dtsi
index 2c560fc30503e68a827f4c2d6f7a3b59e15fed2f..3efa3b2ebe900df62c504340a8ca60c7aa7849c1 100644 (file)
--- a/arch/arm/boot/dts/stih407.dtsi
+++ b/arch/arm/boot/dts/stih407.dtsi
@@ -147,33 +147,5 @@
                                };
                        };
                };
-
-               /* COMMS PWM Module */
-               pwm0: pwm@9810000 {
-                       compatible      = "st,sti-pwm";
-                       status          = "disabled";
-                       #pwm-cells      = <2>;
-                       reg             = <0x9810000 0x68>;
-                       pinctrl-names   = "default";
-                       pinctrl-0       = <&pinctrl_pwm0_chan0_default>;
-                       clock-names     = "pwm";
-                       clocks          = <&clk_sysin>;
-               };
-
-               /* SBC PWM Module */
-               pwm1: pwm@9510000 {
-                       compatible      = "st,sti-pwm";
-                       status          = "disabled";
-                       #pwm-cells      = <2>;
-                       reg             = <0x9510000 0x68>;
-                       pinctrl-names   = "default";
-                       pinctrl-0       = <&pinctrl_pwm1_chan0_default
-                                       &pinctrl_pwm1_chan1_default
-                                       &pinctrl_pwm1_chan2_default
-                                       &pinctrl_pwm1_chan3_default>;
-                       clock-names     = "pwm";
-                       clocks          = <&clk_sysin>;
-                       st,pwm-num-chan = <4>;
-               };
        };
 };