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

Commit ad037c1f authored by Tim Kryger's avatar Tim Kryger Committed by Thomas Gleixner
Browse files

clocksource: Kona: Print warning rather than panic 



Since there may be other clocksources available, this driver should not
trigger a panic simply because it can not determine the frequency of an
external clock.  This change refactors the driver to allow a warning to
be printed in this case instead.

Signed-off-by: default avatarTim Kryger <tim.kryger@linaro.org>
Reviewed-by: default avatarMarkus Mayer <markus.mayer@linaro.org>
Reviewed-by: default avatarMatt Porter <matt.porter@linaro.org>
Cc: Christian Daudt <bcm@fixthebug.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: http://lkml.kernel.org/r/1391559304-26558-1-git-send-email-tim.kryger@linaro.org


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 80d767d7

drivers/clocksource/bcm_kona_timer.c

+28 −26
Original line number Diff line number Diff line
@@ -99,31 +99,6 @@ kona_timer_get_counter(void *timer_base, uint32_t *msw, uint32_t *lsw) 
	return;

}



static void __init kona_timers_init(struct device_node *node)

{

	u32 freq;

	struct clk *external_clk;



	external_clk = of_clk_get_by_name(node, NULL);



	if (!IS_ERR(external_clk)) {

		arch_timer_rate = clk_get_rate(external_clk);

		clk_prepare_enable(external_clk);

	} else if (!of_property_read_u32(node, "clock-frequency", &freq)) {

		arch_timer_rate = freq;

	} else {

		panic("unable to determine clock-frequency");

	}



	/* Setup IRQ numbers */

	timers.tmr_irq = irq_of_parse_and_map(node, 0);



	/* Setup IO addresses */

	timers.tmr_regs = of_iomap(node, 0);



	kona_timer_disable_and_clear(timers.tmr_regs);

}



static int kona_timer_set_next_event(unsigned long clc,

				  struct clock_event_device *unused)

{
@@ -198,7 +173,34 @@ static struct irqaction kona_timer_irq = { 


static void __init kona_timer_init(struct device_node *node)

{

	kona_timers_init(node);

	u32 freq;

	struct clk *external_clk;



	if (!of_device_is_available(node)) {

		pr_info("Kona Timer v1 marked as disabled in device tree\n");

		return;

	}



	external_clk = of_clk_get_by_name(node, NULL);



	if (!IS_ERR(external_clk)) {

		arch_timer_rate = clk_get_rate(external_clk);

		clk_prepare_enable(external_clk);

	} else if (!of_property_read_u32(node, "clock-frequency", &freq)) {

		arch_timer_rate = freq;

	} else {

		pr_err("Kona Timer v1 unable to determine clock-frequency");

		return;

	}



	/* Setup IRQ numbers */

	timers.tmr_irq = irq_of_parse_and_map(node, 0);



	/* Setup IO addresses */

	timers.tmr_regs = of_iomap(node, 0);



	kona_timer_disable_and_clear(timers.tmr_regs);



	kona_timer_clockevents_init();

	setup_irq(timers.tmr_irq, &kona_timer_irq);

	kona_timer_set_next_event((arch_timer_rate / HZ), NULL);