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

Commit 4e2bec0c authored by Michal Simek's avatar Michal Simek Committed by Daniel Lezcano
Browse files

clocksource: cadence_ttc: Add support for 32bit mode 



New TTCs support 32bit mode. Older versions support
only 16bit modes. Keep 16bit mode as default
and 32bit optional.

Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 2743f1be

drivers/clocksource/cadence_ttc_timer.c

+10 −5
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <linux/sched_clock.h>



/*

 * This driver configures the 2 16-bit count-up timers as follows:

 * This driver configures the 2 16/32-bit count-up timers as follows:

 *

 * T1: Timer 1, clocksource for generic timekeeping

 * T2: Timer 2, clockevent source for hrtimers
@@ -321,7 +321,8 @@ static int ttc_rate_change_clocksource_cb(struct notifier_block *nb, 
	return NOTIFY_DONE;

}



static void __init ttc_setup_clocksource(struct clk *clk, void __iomem *base)

static void __init ttc_setup_clocksource(struct clk *clk, void __iomem *base,

					 u32 timer_width)

{

	struct ttc_timer_clocksource *ttccs;

	int err;
@@ -351,7 +352,7 @@ static void __init ttc_setup_clocksource(struct clk *clk, void __iomem *base) 
	ttccs->cs.name = "ttc_clocksource";

	ttccs->cs.rating = 200;

	ttccs->cs.read = __ttc_clocksource_read;

	ttccs->cs.mask = CLOCKSOURCE_MASK(16);

	ttccs->cs.mask = CLOCKSOURCE_MASK(timer_width);

	ttccs->cs.flags = CLOCK_SOURCE_IS_CONTINUOUS;



	/*
@@ -372,7 +373,8 @@ static void __init ttc_setup_clocksource(struct clk *clk, void __iomem *base) 
	}



	ttc_sched_clock_val_reg = base + TTC_COUNT_VAL_OFFSET;

	sched_clock_register(ttc_sched_clock_read, 16, ttccs->ttc.freq / PRESCALE);

	sched_clock_register(ttc_sched_clock_read, timer_width,

			     ttccs->ttc.freq / PRESCALE);

}



static int ttc_rate_change_clockevent_cb(struct notifier_block *nb,
@@ -467,6 +469,7 @@ static void __init ttc_timer_init(struct device_node *timer) 
	struct clk *clk_cs, *clk_ce;

	static int initialized;

	int clksel;

	u32 timer_width = 16;



	if (initialized)

		return;
@@ -490,6 +493,8 @@ static void __init ttc_timer_init(struct device_node *timer) 
		BUG();

	}



	of_property_read_u32(timer, "timer-width", &timer_width);



	clksel = readl_relaxed(timer_baseaddr + TTC_CLK_CNTRL_OFFSET);

	clksel = !!(clksel & TTC_CLK_CNTRL_CSRC_MASK);

	clk_cs = of_clk_get(timer, clksel);
@@ -506,7 +511,7 @@ static void __init ttc_timer_init(struct device_node *timer) 
		BUG();

	}



	ttc_setup_clocksource(clk_cs, timer_baseaddr);

	ttc_setup_clocksource(clk_cs, timer_baseaddr, timer_width);

	ttc_setup_clockevent(clk_ce, timer_baseaddr + 4, irq);



	pr_info("%s #0 at %p, irq=%d\n", timer->name, timer_baseaddr, irq);