Merge remote-tracking branches 'asoc/fix/wm8960' and 'asoc/fix/wm8962' into asoc...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / stih407.dtsi

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>;
-               };
        };
 };