From: Tony Lindgren <tony@atomide.com>
Date: Tue, 29 Jan 2019 15:53:47 +0000 (-0800)
Subject: Merge branch 'pwm-dmtimer-fixes' into omap-for-v5.0/fixes-v2
X-Git-Tag: v5.0-rc7~9^2^2~2
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=072167d13ce46d5fcef1a80a53a667a46c9b17e7

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

072167d13ce46d5fcef1a80a53a667a46c9b17e7
diff --cc drivers/bus/ti-sysc.c
index f94d33525771,12a0401339b8..d299ec79e4c3
--- a/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 */