Merge branch 'pwm-dmtimer-fixes' into omap-for-v5.0/fixes-v2

diff --cc drivers/bus/ti-sysc.c
index f94d33525771bace16dd6ffc3e5fc47e53a28602,12a0401339b8e8bded0482aa269a4eab8c554b9f..d299ec79e4c38bd4b5117b87bd75d639fe596ea1
--- 1/drivers/bus/ti-sysc.c
--- 2/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@@ -781,12 -879,10 +781,12 @@@ static const struct sysc_revision_quir
        SYSC_QUIRK("smartreflex", 0, -1, 0x38, -1, 0x00000000, 0xffffffff,
                   SYSC_QUIRK_LEGACY_IDLE),
        SYSC_QUIRK("timer", 0, 0, 0x10, 0x14, 0x00000015, 0xffffffff,
-                  SYSC_QUIRK_LEGACY_IDLE),
+                  0),
        /* Some timers on omap4 and later */
 -      SYSC_QUIRK("timer", 0, 0, 0x10, -1, 0x4fff1301, 0xffffffff,
 +      SYSC_QUIRK("timer", 0, 0, 0x10, -1, 0x50002100, 0xffffffff,
-                  SYSC_QUIRK_LEGACY_IDLE),
++                 0),
 +      SYSC_QUIRK("timer", 0, 0, 0x10, -1, 0x4fff1301, 0xffff00ff,
-                  SYSC_QUIRK_LEGACY_IDLE),
+                  0),
        SYSC_QUIRK("uart", 0, 0x50, 0x54, 0x58, 0x00000052, 0xffffffff,
                   SYSC_QUIRK_LEGACY_IDLE),
        /* Uarts on omap4 and later */

diff --cc drivers/clocksource/timer-ti-dm.c
Simple merge