Merge tag 'nios2-v4.2' of git://git.rocketboards.org/linux-socfpga-next (31351f73) · Commits · 戴 / test

arch/nios2/kernel/time.c

+13 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@
		#include <linux/io.h>
		#include <linux/slab.h>

		#define ALTR_TIMER_COMPATIBLE "altr,timer-1.0"

		#define ALTERA_TIMER_STATUS_REG 0
		#define ALTERA_TIMER_CONTROL_REG 4
		#define ALTERA_TIMER_PERIODL_REG 8
		@@ -304,7 +306,16 @@ void read_persistent_clock(struct timespec *ts)

		void __init time_init(void)
		{
		struct device_node *np;
		int count = 0;

		for_each_compatible_node(np, NULL, ALTR_TIMER_COMPATIBLE)
		count++;

		if (count < 2)
		panic("%d timer is found, it needs 2 timers in system\n", count);

		clocksource_of_init();
		}

		CLOCKSOURCE_OF_DECLARE(nios2_timer, "altr,timer-1.0", nios2_time_init);
		CLOCKSOURCE_OF_DECLARE(nios2_timer, ALTR_TIMER_COMPATIBLE, nios2_time_init);