Skip to content

Commit

Permalink
ARM: dts: Unify pwm-omap-dmtimer node names
Browse files Browse the repository at this point in the history
[ Upstream commit 4f15fc7 ]

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: ac08bda ("ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot")
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
tmlind authored and gregkh committed Oct 6, 2023
1 parent 4ccb056 commit 16455be
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/am335x-guardian.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/am3517-evm.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
};
};

pwm10: dmtimer-pwm {
pwm10: pwm-10 {
compatible = "ti,omap-dmtimer-pwm";
pinctrl-names = "default";
pinctrl-0 = <&pwm_pins>;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/motorola-mapphone-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
dais = <&mcbsp2_port>, <&mcbsp3_port>;
};

pwm8: dmtimer-pwm-8 {
pwm8: pwm-8 {
pinctrl-names = "default";
pinctrl-0 = <&vibrator_direction_pin>;

Expand All @@ -143,7 +143,7 @@
ti,clock-source = <0x01>;
};

pwm9: dmtimer-pwm-9 {
pwm9: pwm-9 {
pinctrl-names = "default";
pinctrl-0 = <&vibrator_enable_pin>;

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-gta04.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-n900.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down

0 comments on commit 16455be

Please sign in to comment.