Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/mach-tegra/clock.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

arch/arm/mach-tegra/tegra2_clocks.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/arm/mach-tegra/timer.c

+8 −4
Original line number Diff line number Diff line
@@ -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