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

Commit 9bdc2e0c authored by Viresh Kumar's avatar Viresh Kumar
Browse files

ARM/cns3xxx/timer: Migrate to new 'set-state' interface 



Migrate cns3xxx 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.

NOTE: We don't read TIMER1_2_CONTROL_OFFSET register on shutdown
anymore.

Acked-by: default avatarKrzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 5e253571

arch/arm/mach-cns3xxx/core.c

+31 −24
Original line number Diff line number Diff line
@@ -113,30 +113,33 @@ void cns3xxx_power_off(void) 
 */

static void __iomem *cns3xxx_tmr1;



static void cns3xxx_timer_set_mode(enum clock_event_mode mode,

				   struct clock_event_device *clk)

static int cns3xxx_shutdown(struct clock_event_device *clk)

{

	writel(0, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);

	return 0;

}



static int cns3xxx_set_oneshot(struct clock_event_device *clk)

{

	unsigned long ctrl = readl(cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);



	/* period set, and timer enabled in 'next_event' hook */

	ctrl |= (1 << 2) | (1 << 9);

	writel(ctrl, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);

	return 0;

}



static int cns3xxx_set_periodic(struct clock_event_device *clk)

{

	unsigned long ctrl = readl(cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);

	int pclk = cns3xxx_cpu_clock() / 8;

	int reload;



	switch (mode) {

	case CLOCK_EVT_MODE_PERIODIC:

	reload = pclk * 20 / (3 * HZ) * 0x25000;

	writel(reload, cns3xxx_tmr1 + TIMER1_AUTO_RELOAD_OFFSET);

	ctrl |= (1 << 0) | (1 << 2) | (1 << 9);

		break;

	case CLOCK_EVT_MODE_ONESHOT:

		/* period set, and timer enabled in 'next_event' hook */

		ctrl |= (1 << 2) | (1 << 9);

		break;

	case CLOCK_EVT_MODE_UNUSED:

	case CLOCK_EVT_MODE_SHUTDOWN:

	default:

		ctrl = 0;

	}



	writel(ctrl, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);

	return 0;

}



static int cns3xxx_timer_set_next_event(unsigned long evt,
@@ -152,8 +155,12 @@ static int cns3xxx_timer_set_next_event(unsigned long evt, 


static struct clock_event_device cns3xxx_tmr1_clockevent = {

	.name			= "cns3xxx timer1",

	.features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,

	.set_mode	= cns3xxx_timer_set_mode,

	.features		= CLOCK_EVT_FEAT_PERIODIC |

				  CLOCK_EVT_FEAT_ONESHOT,

	.set_state_shutdown	= cns3xxx_shutdown,

	.set_state_periodic	= cns3xxx_set_periodic,

	.set_state_oneshot	= cns3xxx_set_oneshot,

	.tick_resume		= cns3xxx_shutdown,

	.set_next_event		= cns3xxx_timer_set_next_event,

	.rating			= 350,

	.cpumask		= cpu_all_mask,