diff options
-rw-r--r-- | drivers/bus/ti-sysc.c | 4 | ||||
-rw-r--r-- | drivers/clocksource/timer-ti-dm.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index e4fe954e63a9..12a0401339b8 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c | |||
@@ -879,10 +879,10 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = { | |||
879 | SYSC_QUIRK("smartreflex", 0, -1, 0x38, -1, 0x00000000, 0xffffffff, | 879 | SYSC_QUIRK("smartreflex", 0, -1, 0x38, -1, 0x00000000, 0xffffffff, |
880 | SYSC_QUIRK_LEGACY_IDLE), | 880 | SYSC_QUIRK_LEGACY_IDLE), |
881 | SYSC_QUIRK("timer", 0, 0, 0x10, 0x14, 0x00000015, 0xffffffff, | 881 | SYSC_QUIRK("timer", 0, 0, 0x10, 0x14, 0x00000015, 0xffffffff, |
882 | SYSC_QUIRK_LEGACY_IDLE), | 882 | 0), |
883 | /* Some timers on omap4 and later */ | 883 | /* Some timers on omap4 and later */ |
884 | SYSC_QUIRK("timer", 0, 0, 0x10, -1, 0x4fff1301, 0xffffffff, | 884 | SYSC_QUIRK("timer", 0, 0, 0x10, -1, 0x4fff1301, 0xffffffff, |
885 | SYSC_QUIRK_LEGACY_IDLE), | 885 | 0), |
886 | SYSC_QUIRK("uart", 0, 0x50, 0x54, 0x58, 0x00000052, 0xffffffff, | 886 | SYSC_QUIRK("uart", 0, 0x50, 0x54, 0x58, 0x00000052, 0xffffffff, |
887 | SYSC_QUIRK_LEGACY_IDLE), | 887 | SYSC_QUIRK_LEGACY_IDLE), |
888 | /* Uarts on omap4 and later */ | 888 | /* Uarts on omap4 and later */ |
diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c index 3ecf84706640..23414dddc3ba 100644 --- a/drivers/clocksource/timer-ti-dm.c +++ b/drivers/clocksource/timer-ti-dm.c | |||
@@ -868,7 +868,6 @@ static int omap_dm_timer_probe(struct platform_device *pdev) | |||
868 | timer->pdev = pdev; | 868 | timer->pdev = pdev; |
869 | 869 | ||
870 | pm_runtime_enable(dev); | 870 | pm_runtime_enable(dev); |
871 | pm_runtime_irq_safe(dev); | ||
872 | 871 | ||
873 | if (!timer->reserved) { | 872 | if (!timer->reserved) { |
874 | ret = pm_runtime_get_sync(dev); | 873 | ret = pm_runtime_get_sync(dev); |