From e8dc741d888fa9470a2d3b4fe6dc71a936feaaf9 Mon Sep 17 00:00:00 2001 From: Youngmin Nam Date: Thu, 2 May 2019 16:21:28 +0900 Subject: [PATCH] clocksource/drivers/exynos_mct: fix conflict during updating 4.14.113 Change-Id: I9c7b2d3240fae816785ee026628a63bc94e6ac42 Signed-off-by: Youngmin Nam --- drivers/clocksource/exynos_mct.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c index 35e231137cc3..27b41aae04fa 100644 --- a/drivers/clocksource/exynos_mct.c +++ b/drivers/clocksource/exynos_mct.c @@ -392,13 +392,6 @@ static void exynos4_mct_tick_start(unsigned long cycles, int periodic, exynos4_mct_write(tmp, mevt->base + MCT_L_TCON_OFFSET); } -static void exynos4_mct_tick_clear(struct mct_clock_event_device *mevt) -{ - /* Clear the MCT tick interrupt */ - if (readl_relaxed(reg_base + mevt->base + MCT_L_INT_CSTAT_OFFSET) & 1) - exynos4_mct_write(0x1, mevt->base + MCT_L_INT_CSTAT_OFFSET); -} - static int exynos4_tick_set_next_event(unsigned long cycles, struct clock_event_device *evt) { @@ -414,12 +407,7 @@ static int set_state_shutdown(struct clock_event_device *evt) struct mct_clock_event_device *mevt; mevt = container_of(evt, struct mct_clock_event_device, evt); -<<<<<<< HEAD exynos4_mct_tick_stop(mevt, 1); -======= - exynos4_mct_tick_stop(mevt); - exynos4_mct_tick_clear(mevt); ->>>>>>> android-4.14-p return 0; } @@ -441,19 +429,7 @@ static irqreturn_t exynos4_mct_tick_isr(int irq, void *dev_id) struct mct_clock_event_device *mevt = dev_id; struct clock_event_device *evt = &mevt->evt; -<<<<<<< HEAD exynos4_mct_tick_stop(mevt, 0); -======= - /* - * This is for supporting oneshot mode. - * Mct would generate interrupt periodically - * without explicit stopping. - */ - if (!clockevent_state_periodic(&mevt->evt)) - exynos4_mct_tick_stop(mevt); - - exynos4_mct_tick_clear(mevt); ->>>>>>> android-4.14-p evt->event_handler(evt); -- 2.20.1