arm/tegra: don't export clk_measure_input_freq

don't export clk_measure_input_freq as its functionality is also available
using clk_get_rate().

Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Colin Cross <ccross@android.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/mach-tegra/clock.h b/arch/arm/mach-tegra/clock.h
index 8c18e81a9f56d976866dc0d0c366545b269ea0aa..5c44106616c5bed12f0f53a3b54252868a2781ae 100644 (file)
--- a/arch/arm/mach-tegra/clock.h
+++ b/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/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c
index c78abab86253abb5dd8c31a96797617925a5ff2f..ff9e6b6c046077012214778426a944a42db9806f 100644 (file)
--- a/arch/arm/mach-tegra/tegra2_clocks.c
+++ b/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/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c
index 2f1df471c9328783db0b4f5cede240b64b47d6e5..6366654b54c5ade4b19d9bdcbdb7878131135119 100644 (file)
--- a/arch/arm/mach-tegra/timer.c
+++ b/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