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/devices-msm7x27a.c b/arch/arm/mach-msm/devices-msm7x27a.c
index fe40248..a95dc97 100644
--- a/arch/arm/mach-msm/devices-msm7x27a.c
+++ b/arch/arm/mach-msm/devices-msm7x27a.c
@@ -695,24 +695,17 @@
.id = 0,
};
-static struct acpuclk_platform_data msm7x2x_clock_data __initdata = {
- .acpu_switch_time_us = 50,
- .max_speed_delta_khz = 400000,
- .vdd_switch_time_us = 62,
- .max_axi_khz = 200000,
- .init = acpuclk_7201_init,
-};
-
int __init msm7x2x_misc_init(void)
{
if (socinfo_init() < 0)
pr_err("%s: socinfo_init() failed!\n", __func__);
- if (cpu_is_msm7x27aa())
- msm7x2x_clock_data.max_speed_delta_khz = 504000;
-
msm_clock_init(&msm7x27a_clock_init_data);
- acpuclk_init(&msm7x2x_clock_data);
+ if (cpu_is_msm7x27aa())
+ acpuclk_init(&acpuclk_7x27aa_soc_data);
+ else
+ acpuclk_init(&acpuclk_7x27a_soc_data);
+
return 0;
}