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-msm8960.c b/arch/arm/mach-msm/board-msm8960.c
index a135037..a4242bf 100644
--- a/arch/arm/mach-msm/board-msm8960.c
+++ b/arch/arm/mach-msm/board-msm8960.c
@@ -1931,12 +1931,6 @@
return 0;
}
-static struct acpuclk_platform_data msm8960_acpuclk_data __initdata = {
- .acpu_switch_time_us = 0,
- .vdd_switch_time_us = 0,
- .init = acpuclk_8960_init,
-};
-
#define MSM_SHARED_RAM_PHYS 0x80000000
static struct pm8921_adc_amux pm8921_adc_channels_data[] = {
@@ -3512,7 +3506,7 @@
platform_add_devices(common_devices, ARRAY_SIZE(common_devices));
pm8921_gpio_mpp_init();
platform_add_devices(sim_devices, ARRAY_SIZE(sim_devices));
- acpuclk_init(&msm8960_acpuclk_data);
+ acpuclk_init(&acpuclk_8960_soc_data);
msm8960_device_qup_spi_gsbi1.dev.platform_data =
&msm8960_qup_spi_gsbi1_pdata;
@@ -3603,7 +3597,7 @@
platform_add_devices(cdp_devices, ARRAY_SIZE(cdp_devices));
msm8960_init_cam();
msm8960_init_mmc();
- acpuclk_init(&msm8960_acpuclk_data);
+ acpuclk_init(&acpuclk_8960_soc_data);
register_i2c_devices();
msm8960_wcnss_init();
msm_fb_add_devices();