From f523152287195fd7ddc936f95771182265ef8e04 Mon Sep 17 00:00:00 2001 From: Peter De Schrijver Date: Wed, 14 Dec 2011 17:03:16 +0200 Subject: [PATCH] --- yaml --- r: 281651 b: refs/heads/master c: 8e4fab2c39b2db774e41553646788599cfdac9df h: refs/heads/master i: 281649: b74058b03204da2dc1bc1b39375e0530e40c3a71 281647: 6b14fbae87b517a602a4e2067db4c26f2a04b7fb v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tegra/clock.h | 1 - trunk/arch/arm/mach-tegra/tegra2_clocks.c | 2 +- trunk/arch/arm/mach-tegra/timer.c | 12 ++++++++---- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 5d51665077f6..47edde76f1bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 742face03f57727b5a86d0df631e47a1ef0498d2 +refs/heads/master: 8e4fab2c39b2db774e41553646788599cfdac9df diff --git a/trunk/arch/arm/mach-tegra/clock.h b/trunk/arch/arm/mach-tegra/clock.h index 8c18e81a9f56..5c44106616c5 100644 --- a/trunk/arch/arm/mach-tegra/clock.h +++ b/trunk/arch/arm/mach-tegra/clock.h @@ -148,7 +148,6 @@ struct tegra_clk_init_table { void tegra2_init_clocks(void); void clk_init(struct clk *clk); struct clk *tegra_get_clock_by_name(const char *name); -unsigned long clk_measure_input_freq(void); int clk_reparent(struct clk *c, struct clk *parent); void tegra_clk_init_from_table(struct tegra_clk_init_table *table); unsigned long clk_get_rate_locked(struct clk *c); diff --git a/trunk/arch/arm/mach-tegra/tegra2_clocks.c b/trunk/arch/arm/mach-tegra/tegra2_clocks.c index c78abab86253..ff9e6b6c0460 100644 --- a/trunk/arch/arm/mach-tegra/tegra2_clocks.c +++ b/trunk/arch/arm/mach-tegra/tegra2_clocks.c @@ -174,7 +174,7 @@ static int tegra_periph_clk_enable_refcount[3 * 32]; #define pmc_readl(reg) \ __raw_readl(reg_pmc_base + (reg)) -unsigned long clk_measure_input_freq(void) +static unsigned long clk_measure_input_freq(void) { u32 clock_autodetect; clk_writel(OSC_FREQ_DET_TRIG | 1, OSC_FREQ_DET); diff --git a/trunk/arch/arm/mach-tegra/timer.c b/trunk/arch/arm/mach-tegra/timer.c index 2f1df471c932..6366654b54c5 100644 --- a/trunk/arch/arm/mach-tegra/timer.c +++ b/trunk/arch/arm/mach-tegra/timer.c @@ -182,14 +182,18 @@ static struct irqaction tegra_timer_irq = { static void __init tegra_init_timer(void) { struct clk *clk; - unsigned long rate = clk_measure_input_freq(); + unsigned long rate; int ret; clk = clk_get_sys("timer", NULL); - if (IS_ERR(clk)) - pr_warn("Unable to get timer clock\n"); - else + if (IS_ERR(clk)) { + pr_warn("Unable to get timer clock." + " Assuming 12Mhz input clock.\n"); + rate = 12000000; + } else { clk_enable(clk); + rate = clk_get_rate(clk); + } /* * rtc registers are used by read_persistent_clock, keep the rtc clock