msm: acpuclock: Move SoC-specific data into acpuclock drivers
As part of this, hard-code any configuration values that will
not change from board-to-board inside each driver instead of
passing them through the acpuclk_soc_data struct.
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
Conflicts:
arch/arm/mach-msm/acpuclock-8x50.c
diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c
index edebbd8..79279af 100644
--- a/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@ -5524,12 +5524,6 @@
};
#endif
-static struct acpuclk_platform_data msm7x30_clock_data __initdata = {
- .acpu_switch_time_us = 50,
- .vdd_switch_time_us = 62,
- .init = acpuclk_7x30_init,
-};
-
static void __init msm7x30_init_irq(void)
{
msm_init_irq();
@@ -6955,7 +6949,7 @@
msm7x30_init_uart2();
#endif
msm_spm_init(&msm_spm_data, 1);
- acpuclk_init(&msm7x30_clock_data);
+ acpuclk_init(&acpuclk_7x30_soc_data);
if (machine_is_msm7x30_surf() || machine_is_msm7x30_fluid())
msm7x30_cfg_smsc911x();