Merge tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux...

[cascardo/linux.git] / arch / arm / boot / dts / da850.dtsi

diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index c9bf27d..c7e357e 100644 (file)
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -261,13 +261,13 @@
                        dma-names = "rx", "tx";
                        status = "disabled";
                };
-               ehrpwm0: ehrpwm@300000 {
+               ehrpwm0: pwm@300000 {
                        compatible = "ti,da850-ehrpwm", "ti,am33xx-ehrpwm";
                        #pwm-cells = <3>;
                        reg = <0x300000 0x2000>;
                        status = "disabled";
                };
-               ehrpwm1: ehrpwm@302000 {
+               ehrpwm1: pwm@302000 {
                        compatible = "ti,da850-ehrpwm", "ti,am33xx-ehrpwm";
                        #pwm-cells = <3>;
                        reg = <0x302000 0x2000>;