diff options
| author | Viresh Kumar <viresh.kumar@st.com> | 2012-04-10 09:02:35 +0530 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-12 21:44:12 +0200 |
| commit | 5df33a62c4a028d6fc7f2dcc159827d09b7334b8 (patch) | |
| tree | f4da61ce3bf14e9bf4a1dae3188109a6de34f708 /arch/arm/mach-spear3xx/include/mach/generic.h | |
| parent | f8abc080d33e69dfa2c3dd0f84c31832e2679091 (diff) | |
| download | linux-next-5df33a62c4a028d6fc7f2dcc159827d09b7334b8.tar.gz | |
SPEAr: Switch to common clock framework
SPEAr SoCs used its own clock framework since now. From now on they will move to
use common clock framework.
This patch updates existing SPEAr machine support to adapt for common clock
framework.
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Reviewed-by: Mike Turquette <mturquette@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-spear3xx/include/mach/generic.h')
| -rw-r--r-- | arch/arm/mach-spear3xx/include/mach/generic.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-spear3xx/include/mach/generic.h b/arch/arm/mach-spear3xx/include/mach/generic.h index 14276e5a98d2..15c107aad202 100644 --- a/arch/arm/mach-spear3xx/include/mach/generic.h +++ b/arch/arm/mach-spear3xx/include/mach/generic.h @@ -36,8 +36,8 @@ extern struct amba_device spear3xx_uart_device; extern struct sys_timer spear3xx_timer; /* Add spear3xx family function declarations here */ -void __init spear3xx_clk_init(void); void __init spear_setup_timer(void); +void __init spear3xx_clk_init(void); void __init spear3xx_map_io(void); void __init spear3xx_init_irq(void); void __init spear3xx_init(void); @@ -156,7 +156,6 @@ extern struct pmx_dev spear310_pmx_tdm0; /* Add spear310 machine function declarations here */ void __init spear310_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs, u8 pmx_dev_count); - #endif /* CONFIG_MACH_SPEAR310 */ /* spear320 declarations */ |