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/acpuclock.h b/arch/arm/mach-msm/acpuclock.h
index 4a8bf29..77b47ad 100644
--- a/arch/arm/mach-msm/acpuclock.h
+++ b/arch/arm/mach-msm/acpuclock.h
@@ -31,16 +31,12 @@
};
/**
- * struct acpuclk_platform_data - Platform data for acpuclk_init()
+ * struct acpuclk_soc_data - SoC data for acpuclk_init()
*/
-struct acpuclk_platform_data {
- uint32_t acpu_switch_time_us;
+struct acpuclk_soc_data {
unsigned long max_speed_delta_khz;
- uint32_t vdd_switch_time_us;
unsigned int max_axi_khz;
- unsigned int max_vdd;
- int (*acpu_set_vdd) (int mvolts);
- int (*init)(struct acpuclk_platform_data *);
+ int (*init)(struct acpuclk_soc_data *);
};
/**
@@ -100,14 +96,16 @@
*
* Return 0 for success.
*/
-int acpuclk_init(struct acpuclk_platform_data *);
+int acpuclk_init(struct acpuclk_soc_data *);
/* SoC-specific acpuclock initialization functions. */
-int acpuclk_7201_init(struct acpuclk_platform_data *);
-int acpuclk_7x30_init(struct acpuclk_platform_data *);
-int acpuclk_8x50_init(struct acpuclk_platform_data *);
-int acpuclk_8x60_init(struct acpuclk_platform_data *);
-int acpuclk_8960_init(struct acpuclk_platform_data *);
-int acpuclk_9xxx_init(struct acpuclk_platform_data *);
-
+extern struct acpuclk_soc_data acpuclk_7x27_soc_data;
+extern struct acpuclk_soc_data acpuclk_7x27a_soc_data;
+extern struct acpuclk_soc_data acpuclk_7x27aa_soc_data;
+extern struct acpuclk_soc_data acpuclk_7201_soc_data;
+extern struct acpuclk_soc_data acpuclk_7x30_soc_data;
+extern struct acpuclk_soc_data acpuclk_8x50_soc_data;
+extern struct acpuclk_soc_data acpuclk_8x60_soc_data;
+extern struct acpuclk_soc_data acpuclk_8960_soc_data;
+extern struct acpuclk_soc_data acpuclk_9xxx_soc_data;
#endif