clocksource: kona: Print warning rather than panic
PATCH v2 1/1 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 Tim Kryger <[email protected]>
Reviewed-by Markus Mayer <[email protected]>
Reviewed-by Matt Porter <[email protected]>
---
Changes since v1:
- Rebased on v3.14-rc1
drivers/clocksource/bcm_kona_timer.c | 54 +++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 26 deletions(-)
drivers/clocksource/bcm_kona_timer.c +28 -26
@@ -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 );
Signature · 1 line
1.8.0.1
tip-bot for Tim Kryger
merge bot[tip:timers/urgent] clocksource: Kona: Print warning rather than panic
clocksource: Kona: Print warning rather than panic
Commit-ID: ad037c1f4ae6f9258f27fddb679ceb703ff07a88 Gitweb: http://git.kernel.org/tip/ad037c1f4ae6f9258f27fddb679ceb703ff07a88 Author: Tim Kryger <[email protected]> AuthorDate: Tue, 4 Feb 2014 16:15:04 -0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 6 Feb 2014 16:01:40 +0100
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 Tim Kryger <[email protected]>
Reviewed-by Markus Mayer <[email protected]>
Reviewed-by Matt Porter <[email protected]>
Cc Christian Daudt <[email protected]>
Cc Daniel Lezcano <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
--- drivers/clocksource/bcm_kona_timer.c | 54 +++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 26 deletions(-)
drivers/clocksource/bcm_kona_timer.c +28 -26
@@ -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 );