diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-09-26 20:45:26 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-08 09:33:13 -0400 |
| commit | 43ebbfc39ff0b59047b84827a9f92f4a8ff9bb9b (patch) | |
| tree | 090d077042e989089b19d0f086f46e30ef772d52 /arch/arm/mach-keystone/include | |
| parent | 2846bd03eabbb0e4e4c5467519e877ee39d840a2 (diff) | |
| download | u-boot-imx-43ebbfc39ff0b59047b84827a9f92f4a8ff9bb9b.zip u-boot-imx-43ebbfc39ff0b59047b84827a9f92f4a8ff9bb9b.tar.gz u-boot-imx-43ebbfc39ff0b59047b84827a9f92f4a8ff9bb9b.tar.bz2 | |
ARM: keystone: rename clk_get_rate() to ks_clk_get_rate()
The KeyStone platform has its own clk_get_rate() but its prototype
is different from that of the common-clk (clk-uclass) framework.
Prefix the KeyStone specific implementation with ks_ in order to
avoid name-space conflict.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/mach-keystone/include')
| -rw-r--r-- | arch/arm/mach-keystone/include/mach/clock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-keystone/include/mach/clock.h b/arch/arm/mach-keystone/include/mach/clock.h index e2bdec1..0d8a944 100644 --- a/arch/arm/mach-keystone/include/mach/clock.h +++ b/arch/arm/mach-keystone/include/mach/clock.h @@ -125,7 +125,7 @@ extern int speeds[]; void init_plls(void); void init_pll(const struct pll_init_data *data); struct pll_init_data *get_pll_init_data(int pll); -unsigned long clk_get_rate(unsigned int clk); +unsigned long ks_clk_get_rate(unsigned int clk); int get_max_dev_speed(int *spds); int get_max_arm_speed(int *spds); void pll_pa_clk_sel(void); |