diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-11-28 07:35:49 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-11-28 15:21:26 +0100 |
| commit | 14a4a5215675bd41051319eaf42abd259839425e (patch) | |
| tree | 440b195774b2b2f9ccac89b70aaca83c614a3596 /arch | |
| parent | c559baa9e98fafc9367880a343dd11459ca6a044 (diff) | |
| download | barebox-14a4a5215675bd41051319eaf42abd259839425e.tar.gz barebox-14a4a5215675bd41051319eaf42abd259839425e.tar.xz | |
ARM: AT91: Always provide clk_set_rate stub
Some drivers need clk_set_rate. To be able to link with these
drivers enabled provide a clk_set_rate stub.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-at91/clock.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c index a7051c38b0..125d16917e 100644 --- a/arch/arm/mach-at91/clock.c +++ b/arch/arm/mach-at91/clock.c @@ -336,8 +336,6 @@ EXPORT_SYMBOL(clk_get_rate); /*------------------------------------------------------------------------*/ -#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS - /* * For now, only the programmable clocks support reparenting (MCK could * do this too, with care) or rate changing (the PLLs could do this too, @@ -379,6 +377,9 @@ int clk_set_rate(struct clk *clk, unsigned long rate) unsigned long prescale_offset, css_mask; unsigned long actual; + if (!IS_ENABLED(CONFIG_PROGRAMMABLE_CLOCKS)) + return 0; + if (!clk_is_programmable(clk)) return -EINVAL; if (clk->users) @@ -419,6 +420,9 @@ EXPORT_SYMBOL(clk_get_parent); int clk_set_parent(struct clk *clk, struct clk *parent) { + if (!IS_ENABLED(CONFIG_PROGRAMMABLE_CLOCKS)) + return -ENOSYS; + if (clk->users) return -EBUSY; if (!clk_is_primary(parent) || !clk_is_programmable(clk)) @@ -453,8 +457,6 @@ static void init_programmable_clock(struct clk *clk) clk->rate_hz = parent->rate_hz / pmc_prescaler_divider(pckr); } -#endif /* CONFIG_AT91_PROGRAMMABLE_CLOCKS */ - /*------------------------------------------------------------------------*/ /* Register a new clock */ @@ -483,13 +485,10 @@ int clk_register(struct clk *clk) else if (clk_is_sys(clk)) { clk->parent = &mck; clk->mode = pmc_sys_mode; - } -#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS - else if (clk_is_programmable(clk)) { + } else if (IS_ENABLED(CONFIG_PROGRAMMABLE_CLOCKS) && clk_is_programmable(clk)) { clk->mode = pmc_sys_mode; init_programmable_clock(clk); } -#endif at91_clk_add(clk); |