Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[cascardo/linux.git] / arch / arm / boot / dts / am335x-shc.dts

diff --git a/arch/arm/boot/dts/am335x-shc.dts b/arch/arm/boot/dts/am335x-shc.dts
index 865de85..837d5b8 100644 (file)
--- a/arch/arm/boot/dts/am335x-shc.dts
+++ b/arch/arm/boot/dts/am335x-shc.dts
@@ -138,7 +138,7 @@
 &epwmss1 {
        status = "okay";
 
-       ehrpwm1: ehrpwm@48302200 {
+       ehrpwm1: pwm@48302200 {
                pinctrl-names = "default";
                pinctrl-0 = <&ehrpwm1_pins>;
                status = "okay";