Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cfa3c69 authored by Viresh Kumar's avatar Viresh Kumar
Browse files

ARM/ks8695/time: Migrate to new 'set-state' interface 



Migrate ks8695 driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.

This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.

There is nothing to be done for oneshot or shutdown states and so are
not implemented.

Acked-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent cea50eee

arch/arm/mach-ks8695/time.c

+21 −22
Original line number Diff line number Diff line
@@ -54,14 +54,11 @@ 
/* Timer0 Timeout Counter Register */

#define T0TC_WATCHDOG		(0xff)		/* Enable watchdog mode */



static void ks8695_set_mode(enum clock_event_mode mode,

			    struct clock_event_device *evt)

static int ks8695_set_periodic(struct clock_event_device *evt)

{

	u32 tmcon;



	if (mode == CLOCK_EVT_FEAT_PERIODIC) {

	u32 rate = DIV_ROUND_CLOSEST(KS8695_CLOCK_RATE, HZ);

	u32 half = DIV_ROUND_CLOSEST(rate, 2);

	u32 tmcon;



	/* Disable timer 1 */

	tmcon = readl_relaxed(KS8695_TMR_VA + KS8695_TMCON);
@@ -75,7 +72,7 @@ static void ks8695_set_mode(enum clock_event_mode mode, 
	/* Re-enable timer1 */

	tmcon |= TMCON_T1EN;

	writel_relaxed(tmcon, KS8695_TMR_VA + KS8695_TMCON);

	}

	return 0;

}



static int ks8695_set_next_event(unsigned long cycles,
@@ -103,10 +100,12 @@ static int ks8695_set_next_event(unsigned long cycles, 


static struct clock_event_device clockevent_ks8695 = {

	.name			= "ks8695_t1tc",

	.rating		= 300, /* Reasonably fast and accurate clock event */

	.features	= CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERIODIC,

	/* Reasonably fast and accurate clock event */

	.rating			= 300,

	.features		= CLOCK_EVT_FEAT_ONESHOT |

				  CLOCK_EVT_FEAT_PERIODIC,

	.set_next_event		= ks8695_set_next_event,

	.set_mode	= ks8695_set_mode,

	.set_state_periodic	= ks8695_set_periodic,

};



/*