Commit 8e4fab2c authored by Peter De Schrijver's avatar Peter De Schrijver Committed by Olof Johansson

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: default avatarPeter De Schrijver <pdeschrijver@nvidia.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarColin Cross <ccross@android.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 742face0
...@@ -148,7 +148,6 @@ struct tegra_clk_init_table { ...@@ -148,7 +148,6 @@ struct tegra_clk_init_table {
void tegra2_init_clocks(void); void tegra2_init_clocks(void);
void clk_init(struct clk *clk); void clk_init(struct clk *clk);
struct clk *tegra_get_clock_by_name(const char *name); 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); int clk_reparent(struct clk *c, struct clk *parent);
void tegra_clk_init_from_table(struct tegra_clk_init_table *table); void tegra_clk_init_from_table(struct tegra_clk_init_table *table);
unsigned long clk_get_rate_locked(struct clk *c); unsigned long clk_get_rate_locked(struct clk *c);
......
...@@ -174,7 +174,7 @@ static int tegra_periph_clk_enable_refcount[3 * 32]; ...@@ -174,7 +174,7 @@ static int tegra_periph_clk_enable_refcount[3 * 32];
#define pmc_readl(reg) \ #define pmc_readl(reg) \
__raw_readl(reg_pmc_base + (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; u32 clock_autodetect;
clk_writel(OSC_FREQ_DET_TRIG | 1, OSC_FREQ_DET); clk_writel(OSC_FREQ_DET_TRIG | 1, OSC_FREQ_DET);
......
...@@ -182,14 +182,18 @@ static struct irqaction tegra_timer_irq = { ...@@ -182,14 +182,18 @@ static struct irqaction tegra_timer_irq = {
static void __init tegra_init_timer(void) static void __init tegra_init_timer(void)
{ {
struct clk *clk; struct clk *clk;
unsigned long rate = clk_measure_input_freq(); unsigned long rate;
int ret; int ret;
clk = clk_get_sys("timer", NULL); clk = clk_get_sys("timer", NULL);
if (IS_ERR(clk)) if (IS_ERR(clk)) {
pr_warn("Unable to get timer clock\n"); pr_warn("Unable to get timer clock."
else " Assuming 12Mhz input clock.\n");
rate = 12000000;
} else {
clk_enable(clk); clk_enable(clk);
rate = clk_get_rate(clk);
}
/* /*
* rtc registers are used by read_persistent_clock, keep the rtc clock * rtc registers are used by read_persistent_clock, keep the rtc clock
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment