Commit d7f430d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32 

Pull AVR32 update from Hans-Christian Egtvedt.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
  AVR32/time: Migrate to new 'set-state' interface
parents 52721d9d 09adcdf2

arch/avr32/kernel/time.c

+33 −32
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <mach/pm.h>



static bool disable_cpu_idle_poll;



static cycle_t read_cycle_count(struct clocksource *cs)

{
@@ -80,36 +81,34 @@ static int comparator_next_event(unsigned long delta, 
	return 0;

}



static void comparator_mode(enum clock_event_mode mode,

		struct clock_event_device *evdev)

static int comparator_shutdown(struct clock_event_device *evdev)

{

	switch (mode) {

	case CLOCK_EVT_MODE_ONESHOT:

		pr_debug("%s: start\n", evdev->name);

		/* FALLTHROUGH */

	case CLOCK_EVT_MODE_RESUME:

		/*

		 * If we're using the COUNT and COMPARE registers we

		 * need to force idle poll.

		 */

		cpu_idle_poll_ctrl(true);

		break;

	case CLOCK_EVT_MODE_UNUSED:

	case CLOCK_EVT_MODE_SHUTDOWN:

	pr_debug("%s: %s\n", __func__, evdev->name);

	sysreg_write(COMPARE, 0);

		pr_debug("%s: stop\n", evdev->name);

		if (evdev->mode == CLOCK_EVT_MODE_ONESHOT ||

		    evdev->mode == CLOCK_EVT_MODE_RESUME) {



	if (disable_cpu_idle_poll) {

		disable_cpu_idle_poll = false;

		/*

		 * Only disable idle poll if we have forced that

		 * in a previous call.

		 */

		cpu_idle_poll_ctrl(false);

	}

		break;

	default:

		BUG();

	return 0;

}



static int comparator_set_oneshot(struct clock_event_device *evdev)

{

	pr_debug("%s: %s\n", __func__, evdev->name);



	disable_cpu_idle_poll = true;

	/*

	 * If we're using the COUNT and COMPARE registers we

	 * need to force idle poll.

	 */

	cpu_idle_poll_ctrl(true);



	return 0;

}



static struct clock_event_device comparator = {
@@ -118,7 +117,9 @@ static struct clock_event_device comparator = { 
	.shift			= 16,

	.rating			= 50,

	.set_next_event		= comparator_next_event,

	.set_mode	= comparator_mode,

	.set_state_shutdown	= comparator_shutdown,

	.set_state_oneshot	= comparator_set_oneshot,

	.tick_resume		= comparator_set_oneshot,

};



void read_persistent_clock(struct timespec *ts)