Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / pwm / pwm-tipwmss.txt

diff --git a/Documentation/devicetree/bindings/pwm/pwm-tipwmss.txt b/Documentation/devicetree/bindings/pwm/pwm-tipwmss.txt
index 1a5d7b71db89ca07092c9b15e1ebed90fdbc4f6b..4633697fbda1f53a1e897663bfc53cf602cb8ad9 100644 (file)
--- a/Documentation/devicetree/bindings/pwm/pwm-tipwmss.txt
+++ b/Documentation/devicetree/bindings/pwm/pwm-tipwmss.txt
@@ -26,7 +26,6 @@ epwmss0: epwmss@48300000 { /* PWMSS for am33xx */
        ti,hwmods = "epwmss0";
        #address-cells = <1>;
        #size-cells = <1>;
-       status = "disabled";
        ranges = <0x48300100 0x48300100 0x80   /* ECAP */
                  0x48300180 0x48300180 0x80   /* EQEP */
                  0x48300200 0x48300200 0x80>; /* EHRPWM */
@@ -40,7 +39,6 @@ epwmss0: epwmss@48300000 { /* PWMSS for am4372 */
        ti,hwmods = "epwmss0";
        #address-cells = <1>;
        #size-cells = <1>;
-       status = "disabled";
        ranges = <0x48300100 0x48300100 0x80   /* ECAP */
                  0x48300180 0x48300180 0x80   /* EQEP */
                  0x48300200 0x48300200 0x80>; /* EHRPWM */