ARM: dts: Unify pwm-omap-dmtimer node names

[ Upstream commit 4f15fc7c0f28ffcd6e9a56396db6edcdfa4c9925 ]

There is no reg property for pwm-omap-dmtimer.

Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Stable-dep-of: ac08bda1569b ("ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/am335x-guardian.dts b/arch/arm/boot/dts/am335x-guardian.dts
index f6356266564c87f259ed3b2ca6132bff01b9784c..b357364e93f994a6dc0393ad725628c09423c8d1 100644 (file)
--- a/arch/arm/boot/dts/am335x-guardian.dts
+++ b/arch/arm/boot/dts/am335x-guardian.dts
@@ -103,8 +103,9 @@
 
        };
 
-       guardian_beeper: dmtimer-pwm@7 {
+       guardian_beeper: pwm-7 {
                compatible = "ti,omap-dmtimer-pwm";
+               #pwm-cells = <3>;
                ti,timers = <&timer7>;
                pinctrl-names = "default";
                pinctrl-0 = <&guardian_beeper_pins>;

diff --git a/arch/arm/boot/dts/am3517-evm.dts b/arch/arm/boot/dts/am3517-evm.dts
index 35b653014f2b0afed32a8ff5f8b5f684f152dd85..7bab0a9dadb301b1b43d56f257543a01b6d0b910 100644 (file)
--- a/arch/arm/boot/dts/am3517-evm.dts
+++ b/arch/arm/boot/dts/am3517-evm.dts
@@ -150,7 +150,7 @@
                enable-gpios = <&gpio6 22 GPIO_ACTIVE_HIGH>; /* gpio_182 */
        };
 
-       pwm11: dmtimer-pwm@11 {
+       pwm11: pwm-11 {
                compatible = "ti,omap-dmtimer-pwm";
                pinctrl-names = "default";
                pinctrl-0 = <&pwm_pins>;

diff --git a/arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi b/arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi
index d3da8b1b473b8ee6aa9cac0882eef809bc8c2b26..e0cbac500e1729ef096e6757312033998e4dd064 100644 (file)
--- a/arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi
+++ b/arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi
@@ -59,7 +59,7 @@
                };
        };
 
-       pwm10: dmtimer-pwm {
+       pwm10: pwm-10 {
                compatible = "ti,omap-dmtimer-pwm";
                pinctrl-names = "default";
                pinctrl-0 = <&pwm_pins>;

diff --git a/arch/arm/boot/dts/motorola-mapphone-common.dtsi b/arch/arm/boot/dts/motorola-mapphone-common.dtsi
index c7a1f3ffc48ca58e0bc78229c58b0b14653b6abb..f7cc8fc678fa5a76ee46c2164dafe47ca8979f23 100644 (file)
--- a/arch/arm/boot/dts/motorola-mapphone-common.dtsi
+++ b/arch/arm/boot/dts/motorola-mapphone-common.dtsi
@@ -133,7 +133,7 @@
                dais = <&mcbsp2_port>, <&mcbsp3_port>;
        };
 
-       pwm8: dmtimer-pwm-8 {
+       pwm8: pwm-8 {
                pinctrl-names = "default";
                pinctrl-0 = <&vibrator_direction_pin>;
 
@@ -143,7 +143,7 @@
                ti,clock-source = <0x01>;
        };
 
-       pwm9: dmtimer-pwm-9 {
+       pwm9: pwm-9 {
                pinctrl-names = "default";
                pinctrl-0 = <&vibrator_enable_pin>;
 

diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi
index da578719ac5a2f2c3de6d50b5443f87e4acf0633..e0be0fb23f80f5909b463ac35ef042cfde6429d2 100644 (file)
--- a/arch/arm/boot/dts/omap3-gta04.dtsi
+++ b/arch/arm/boot/dts/omap3-gta04.dtsi
@@ -147,7 +147,7 @@
                pinctrl-0 = <&backlight_pins>;
        };
 
-       pwm11: dmtimer-pwm {
+       pwm11: pwm-11 {
                compatible = "ti,omap-dmtimer-pwm";
                ti,timers = <&timer11>;
                #pwm-cells = <3>;

diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 98a67581bdd232ed657d61f4eb3fb4a431a62ed4..89ab08d83261a103eb055c7e987262bcba76884a 100644 (file)
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -156,7 +156,7 @@
                io-channel-names = "temp", "bsi", "vbat";
        };
 
-       pwm9: dmtimer-pwm {
+       pwm9: pwm-9 {
                compatible = "ti,omap-dmtimer-pwm";
                #pwm-cells = <3>;
                ti,timers = <&timer9>;