ARM: dts: am437x/am33xx: Remove hwmod entries for ECAP and EPWM nodes

Previous patches switched the ECAP and EPWM to use the new bindings.
These bindings explicitly adds the various required clocks via DT rather
than depending on hwmod.

Therefore, it is safe to remove the hwmod entries since they are no longer
needed.

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/Documentation/devicetree/bindings/pwm/pwm-tiecap.txt b/Documentation/devicetree/bindings/pwm/pwm-tiecap.txt
index ee0a8bd34701bfe4bae92a0d79165023ed26b5e0..f2a9a7cbea34df48333ab2c4e2ae07035592dad8 100644 (file)
--- a/Documentation/devicetree/bindings/pwm/pwm-tiecap.txt
+++ b/Documentation/devicetree/bindings/pwm/pwm-tiecap.txt
@@ -11,8 +11,6 @@ Required properties:
 - reg: physical base address and size of the registers map.
 
 Optional properties:
-- ti,hwmods: Name of the hwmod associated to the ECAP:
-  "ecap<x>", <x> being the 0-based instance number from the HW spec
 - clocks: Handle to the ECAP's functional clock.
 - clock-names: Must be set to "fck".
 
@@ -22,7 +20,6 @@ ecap0: ecap@48300100 { /* ECAP on am33xx */
        compatible = "ti,am3352-ecap", "ti,am33xx-ecap";
        #pwm-cells = <3>;
        reg = <0x48300100 0x80>;
-       ti,hwmods = "ecap0";
        clocks = <&l4ls_gclk>;
        clock-names = "fck";
 };

diff --git a/Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt b/Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt
index e9a156b56bd525258b9b40c405ce5666423bd10b..41a2bd4b9fe39c36c9806ede64f57df13c116ccc 100644 (file)
--- a/Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt
+++ b/Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt
@@ -11,8 +11,6 @@ Required properties:
 - reg: physical base address and size of the registers map.
 
 Optional properties:
-- ti,hwmods: Name of the hwmod associated to the EHRPWM:
-  "ehrpwm<x>", <x> being the 0-based instance number from the HW spec
 - clocks: Handle to the PWM's time-base and functional clock.
 - clock-names: Must be set to "tbclk" and "fck".
 
@@ -24,7 +22,6 @@ ehrpwm0: pwm@48300200 { /* EHRPWM on am33xx */
        reg = <0x48300200 0x100>;
        clocks = <&ehrpwm0_tbclk>, <&l4ls_gclk>;
        clock-names = "tbclk", "fck";
-       ti,hwmods = "ehrpwm0";
 };
 
 ehrpwm0: pwm@48300200 { /* EHRPWM on am4372 */

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 999ba2f1a8b7c717d1ec5100cab4299fd2c1b5bb..2661accdcd9212b7dd177895ccc95d4bb14a14a5 100644 (file)
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -687,7 +687,6 @@
                                clock-names = "fck";
                                interrupts = <31>;
                                interrupt-names = "ecap0";
-                               ti,hwmods = "ecap0";
                                status = "disabled";
                        };
 
@@ -696,7 +695,6 @@
                                             "ti,am33xx-ehrpwm";
                                #pwm-cells = <3>;
                                reg = <0x48300200 0x80>;
-                               ti,hwmods = "ehrpwm0";
                                clocks = <&ehrpwm0_tbclk>, <&l4ls_gclk>;
                                clock-names = "tbclk", "fck";
                                status = "disabled";
@@ -723,7 +721,6 @@
                                clock-names = "fck";
                                interrupts = <47>;
                                interrupt-names = "ecap1";
-                               ti,hwmods = "ecap1";
                                status = "disabled";
                        };
 
@@ -732,7 +729,6 @@
                                             "ti,am33xx-ehrpwm";
                                #pwm-cells = <3>;
                                reg = <0x48302200 0x80>;
-                               ti,hwmods = "ehrpwm1";
                                clocks = <&ehrpwm1_tbclk>, <&l4ls_gclk>;
                                clock-names = "tbclk", "fck";
                                status = "disabled";
@@ -759,7 +755,6 @@
                                clock-names = "fck";
                                interrupts = <61>;
                                interrupt-names = "ecap2";
-                               ti,hwmods = "ecap2";
                                status = "disabled";
                        };
 
@@ -768,7 +763,6 @@
                                             "ti,am33xx-ehrpwm";
                                #pwm-cells = <3>;
                                reg = <0x48304200 0x80>;
-                               ti,hwmods = "ehrpwm2";
                                clocks = <&ehrpwm2_tbclk>, <&l4ls_gclk>;
                                clock-names = "tbclk", "fck";
                                status = "disabled";

diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index e8584606d56f893367cb4dc53e933efbcb16795a..cfdd4b77f7141d028b5cee73fe935bc754a24f56 100644 (file)
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -677,7 +677,6 @@
                                             "ti,am33xx-ecap";
                                #pwm-cells = <3>;
                                reg = <0x48300100 0x80>;
-                               ti,hwmods = "ecap0";
                                clocks = <&l4ls_gclk>;
                                clock-names = "fck";
                                status = "disabled";
@@ -689,7 +688,6 @@
                                             "ti,am33xx-ehrpwm";
                                #pwm-cells = <3>;
                                reg = <0x48300200 0x80>;
-                               ti,hwmods = "ehrpwm0";
                                clocks = <&ehrpwm0_tbclk>, <&l4ls_gclk>;
                                clock-names = "tbclk", "fck";
                                status = "disabled";
@@ -711,7 +709,6 @@
                                             "ti,am33xx-ecap";
                                #pwm-cells = <3>;
                                reg = <0x48302100 0x80>;
-                               ti,hwmods = "ecap1";
                                clocks = <&l4ls_gclk>;
                                clock-names = "fck";
                                status = "disabled";
@@ -723,7 +720,6 @@
                                             "ti,am33xx-ehrpwm";
                                #pwm-cells = <3>;
                                reg = <0x48302200 0x80>;
-                               ti,hwmods = "ehrpwm1";
                                clocks = <&ehrpwm1_tbclk>, <&l4ls_gclk>;
                                clock-names = "tbclk", "fck";
                                status = "disabled";
@@ -747,7 +743,6 @@
                                reg = <0x48304100 0x80>;
                                clocks = <&l4ls_gclk>;
                                clock-names = "fck";
-                               ti,hwmods = "ecap2";
                                status = "disabled";
                        };
 
@@ -757,7 +752,6 @@
                                             "ti,am33xx-ehrpwm";
                                #pwm-cells = <3>;
                                reg = <0x48304200 0x80>;
-                               ti,hwmods = "ehrpwm2";
                                clocks = <&ehrpwm2_tbclk>, <&l4ls_gclk>;
                                clock-names = "tbclk", "fck";
                                status = "disabled";
@@ -779,7 +773,6 @@
                                             "ti,am33xx-ehrpwm";
                                #pwm-cells = <3>;
                                reg = <0x48306200 0x80>;
-                               ti,hwmods = "ehrpwm3";
                                clocks = <&ehrpwm3_tbclk>, <&l4ls_gclk>;
                                clock-names = "tbclk", "fck";
                                status = "disabled";
@@ -801,7 +794,6 @@
                                             "ti,am33xx-ehrpwm";
                                #pwm-cells = <3>;
                                reg = <0x48308200 0x80>;
-                               ti,hwmods = "ehrpwm4";
                                clocks = <&ehrpwm4_tbclk>, <&l4ls_gclk>;
                                clock-names = "tbclk", "fck";
                                status = "disabled";
@@ -825,7 +817,6 @@
                                reg = <0x4830a200 0x80>;
                                clocks = <&ehrpwm5_tbclk>, <&l4ls_gclk>;
                                clock-names = "tbclk", "fck";
-                               ti,hwmods = "ehrpwm5";
                                status = "disabled";
                        };
                };