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-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
index c99dc6d..30e5cdb 100644
--- a/arch/arm/mach-msm/board-qsd8x50.c
+++ b/arch/arm/mach-msm/board-qsd8x50.c
@@ -20,7 +20,6 @@
#include <linux/i2c.h>
#include <linux/spi/spi.h>
#include <linux/delay.h>
-#include <linux/mfd/tps65023.h>
#include <linux/bma150.h>
#include <linux/power_supply.h>
#include <linux/clk.h>
@@ -1213,43 +1212,6 @@
#endif /* defined(CONFIG_TSIF) || defined(CONFIG_TSIF_MODULE) */
/* TSIF end */
-#ifdef CONFIG_QSD_SVS
-#define TPS65023_MAX_DCDC1 1600
-#else
-#define TPS65023_MAX_DCDC1 CONFIG_QSD_PMIC_DEFAULT_DCDC1
-#endif
-
-static int qsd8x50_tps65023_set_dcdc1(int mVolts)
-{
- int rc = 0;
-#ifdef CONFIG_QSD_SVS
- rc = tps65023_set_dcdc1_level(mVolts);
- /* By default the TPS65023 will be initialized to 1.225V.
- * So we can safely switch to any frequency within this
- * voltage even if the device is not probed/ready.
- */
- if (rc == -ENODEV && mVolts <= CONFIG_QSD_PMIC_DEFAULT_DCDC1)
- rc = 0;
-#else
- /* Disallow frequencies not supported in the default PMIC
- * output voltage.
- */
- if (mVolts > CONFIG_QSD_PMIC_DEFAULT_DCDC1)
- rc = -EFAULT;
-#endif
- return rc;
-}
-
-static struct acpuclk_platform_data qsd8x50_clock_data __initdata = {
- .acpu_switch_time_us = 20,
- .max_speed_delta_khz = 256000,
- .vdd_switch_time_us = 62,
- .max_vdd = TPS65023_MAX_DCDC1,
- .acpu_set_vdd = qsd8x50_tps65023_set_dcdc1,
- .init = acpuclk_8x50_init,
-};
-
-
static void touchpad_gpio_release(void)
{
gpio_free(TOUCHPAD_IRQ);
@@ -2444,7 +2406,7 @@
__func__);
msm_clock_init(&qds8x50_clock_init_data);
qsd8x50_cfg_smc91x();
- acpuclk_init(&qsd8x50_clock_data);
+ acpuclk_init(&acpuclk_8x50_soc_data);
msm_hsusb_pdata.swfi_latency =
msm_pm_data