aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-tegra/timer.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c
index 6ff503536512..afcd108f0f28 100644
--- a/arch/arm/mach-tegra/timer.c
+++ b/arch/arm/mach-tegra/timer.c
@@ -184,8 +184,7 @@ static void __init tegra_init_timer(void)
184 184
185 clk = clk_get_sys("timer", NULL); 185 clk = clk_get_sys("timer", NULL);
186 if (IS_ERR(clk)) { 186 if (IS_ERR(clk)) {
187 pr_warn("Unable to get timer clock." 187 pr_warn("Unable to get timer clock. Assuming 12Mhz input clock.\n");
188 " Assuming 12Mhz input clock.\n");
189 rate = 12000000; 188 rate = 12000000;
190 } else { 189 } else {
191 clk_prepare_enable(clk); 190 clk_prepare_enable(clk);
@@ -223,13 +222,13 @@ static void __init tegra_init_timer(void)
223 222
224 if (clocksource_mmio_init(timer_reg_base + TIMERUS_CNTR_1US, 223 if (clocksource_mmio_init(timer_reg_base + TIMERUS_CNTR_1US,
225 "timer_us", 1000000, 300, 32, clocksource_mmio_readl_up)) { 224 "timer_us", 1000000, 300, 32, clocksource_mmio_readl_up)) {
226 printk(KERN_ERR "Failed to register clocksource\n"); 225 pr_err("Failed to register clocksource\n");
227 BUG(); 226 BUG();
228 } 227 }
229 228
230 ret = setup_irq(tegra_timer_irq.irq, &tegra_timer_irq); 229 ret = setup_irq(tegra_timer_irq.irq, &tegra_timer_irq);
231 if (ret) { 230 if (ret) {
232 printk(KERN_ERR "Failed to register timer IRQ: %d\n", ret); 231 pr_err("Failed to register timer IRQ: %d\n", ret);
233 BUG(); 232 BUG();
234 } 233 }
235 234