diff options
| author | Tony Lindgren <tony@atomide.com> | 2019-01-29 16:53:47 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-01-29 16:53:47 +0100 |
| commit | 072167d13ce46d5fcef1a80a53a667a46c9b17e7 (patch) | |
| tree | d978e8c7d523702d8da2964c02a10f3301015847 /drivers/bus | |
| parent | ARM: OMAP5+: Fix inverted nirq pin interrupts with irq_set_type (diff) | |
| parent | ARM: dts: Configure clock parent for pwm vibra (diff) | |
| download | linux-072167d13ce46d5fcef1a80a53a667a46c9b17e7.tar.xz linux-072167d13ce46d5fcef1a80a53a667a46c9b17e7.zip | |
Merge branch 'pwm-dmtimer-fixes' into omap-for-v5.0/fixes-v2
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/ti-sysc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index f94d33525771..d299ec79e4c3 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -781,12 +781,12 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = { 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, 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 */ |