commit 6d9ebeef798d736676e423e91e2f327a061251e2
author Matt Wagantall <mattw@codeaurora.org> Fri Aug 26 12:15:24 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 16:17:59 2011 -0700
tree 11e91cef9c5ff7c544db76f52f5423dc5cc8c316
parent 7a651aa9d571985b39687169df949fe955e16d6d

msm: acpuclock: Implement acpuclock APIs through function pointers

Create a generic wrapper acpuclock driver in acpuclock.c to call
SoC-specific function pointer API implementations.  With the
exception of iomap conflicts, this should allow multiple acpuclock
driver implementations to be compiled into the same kernel binary.

Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

Conflicts:

	arch/arm/mach-msm/acpuclock-7201.c
	arch/arm/mach-msm/board-msm8960.c

arch/arm/mach-msm/board-msm7x27.c

diff --git a/arch/arm/mach-msm/board-msm7x27.c b/arch/arm/mach-msm/board-msm7x27.c
index 3959bf2..bf1c4b4 100644
--- a/arch/arm/mach-msm/board-msm7x27.c
+++ b/arch/arm/mach-msm/board-msm7x27.c
@@ -60,6 +60,7 @@
 
 #include "devices.h"
 #include "clock.h"
+#include "acpuclock.h"
 #include "msm-keypad-devices.h"
 #include "pm.h"
 
@@ -1488,11 +1489,12 @@
 	msm_init_irq();
 }
 
-static struct msm_acpu_clock_platform_data msm7x2x_clock_data = {
+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 = 160000,
+	.init = acpuclk_7201_init,
 };
 
 void msm_serial_debug_init(unsigned int base, int irq,
@@ -1894,7 +1896,7 @@
 	if (cpu_is_msm7x27())
 		msm7x2x_clock_data.max_axi_khz = 200000;
 
-	msm_acpu_clock_init(&msm7x2x_clock_data);
+	acpuclk_init(&msm7x2x_clock_data);
 
 	usb_mpp_init();