summary refs log tree commit diff
path: root/arch/arm/mach-msm/devices-msm7x30.c
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2013-06-17 10:43:19 -0700
committerDavid Brown <davidb@codeaurora.org>2013-06-24 13:08:05 -0700
commit8cc7f5338e729b79194e6c22e3c794faaef974b8 (patch)
treed9fad83dcb3e260ad862907a80431ad70d51883e /arch/arm/mach-msm/devices-msm7x30.c
parent421faca0b538d1ed5f2065cbbc6bbec38f49a54f (diff)
downloadlinux-8cc7f5338e729b79194e6c22e3c794faaef974b8.tar.gz
ARM: msm: Migrate to common clock framework
Move the existing clock code in mach-msm to the common clock
framework. We lose our capability to set the rate of and enable a
clock through debugfs. This is ok though because the debugfs
features are mainly used for testing and development of new clock
code.

To maintain compatibility with the original MSM clock code we
make a wrapper for clk_reset() that calls the struct msm_clk
specific reset function. This is necessary for the usb and sdcc
devices on MSM until a better suited API is made available.

Cc: Saravana Kannan <skannan@codeaurora.org>
Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/devices-msm7x30.c')
-rw-r--r--arch/arm/mach-msm/devices-msm7x30.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c
index 6444f0e618f6..d4db75acff56 100644
--- a/arch/arm/mach-msm/devices-msm7x30.c
+++ b/arch/arm/mach-msm/devices-msm7x30.c
@@ -161,7 +161,7 @@ struct platform_device msm_device_hsusb_host = {
 	},
 };
 
-static struct clk_lookup msm_clocks_7x30[] = {
+static struct clk_pcom_desc msm_clocks_7x30[] = {
 	CLK_PCOM("adm_clk",	ADM_CLK,	NULL, 0),
 	CLK_PCOM("adsp_clk",	ADSP_CLK,	NULL, 0),
 	CLK_PCOM("cam_m_clk",	CAM_M_CLK,	NULL, 0),