Merge tag 'davinci-for-v4.7/dt-part2' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git] / arch / arm / boot / dts / da850.dtsi
index cf1aad8190f15bb470c53f835a0ca7a6ebe6ff36..25f0f8e6dde5ecfa7f4452e99706cb72e15d1b7e 100644 (file)
                        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>;