1 files changed, 10 insertions, 5 deletions

diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c
index 12f482c07740..d4db75acff56 100644
--- a/arch/arm/mach-msm/devices-msm7x30.c
+++ b/arch/arm/mach-msm/devices-msm7x30.c
@@ -28,8 +28,8 @@
 
 #include <asm/mach/flash.h>
 
+#include "clock.h"
 #include "clock-pcom.h"
-#include "clock-7x30.h"
 
 #include <linux/platform_data/mmc-msm_sdcc.h>
 
@@ -161,7 +161,7 @@ struct platform_device msm_device_hsusb_host = {
         },
 };
 
-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),
@@ -177,7 +177,6 @@ struct clk_lookup msm_clocks_7x30[] = {
         CLK_PCOM("grp_2d_pclk", GRP_2D_P_CLK,   NULL, 0),
         CLK_PCOM("grp_clk",     GRP_3D_CLK,     NULL, 0),
         CLK_PCOM("grp_pclk",    GRP_3D_P_CLK,   NULL, 0),
-        CLK_7X30S("grp_src_clk", GRP_3D_SRC_CLK, GRP_3D_CLK,    NULL, 0),
         CLK_PCOM("hdmi_clk",    HDMI_CLK,       NULL, 0),
         CLK_PCOM("imem_clk",    IMEM_CLK,       NULL, OFF),
         CLK_PCOM("jpeg_clk",    JPEG_CLK,       NULL, OFF),
@@ -210,7 +209,6 @@ struct clk_lookup msm_clocks_7x30[] = {
         CLK_PCOM("sdac_clk",    SDAC_CLK,       NULL, OFF),
         CLK_PCOM("spi_clk",     SPI_CLK,        NULL, 0),
         CLK_PCOM("spi_pclk",    SPI_P_CLK,      NULL, 0),
-        CLK_7X30S("tv_src_clk", TV_CLK,         TV_ENC_CLK,     NULL, 0),
         CLK_PCOM("tv_dac_clk",  TV_DAC_CLK,     NULL, 0),
         CLK_PCOM("tv_enc_clk",  TV_ENC_CLK,     NULL, 0),
         CLK_PCOM("uart_clk",    UART2_CLK,      "msm_serial.1", 0),
@@ -237,5 +235,12 @@ struct clk_lookup msm_clocks_7x30[] = {
         CLK_PCOM("csi_vfe_clk", CSI0_VFE_CLK,   NULL, 0),
 };
 
-unsigned msm_num_clocks_7x30 = ARRAY_SIZE(msm_clocks_7x30);
+static struct pcom_clk_pdata msm_clock_7x30_pdata = {
+        .lookup = msm_clocks_7x30,
+        .num_lookups = ARRAY_SIZE(msm_clocks_7x30),
+};
 
+struct platform_device msm_clock_7x30 = {
+        .name = "msm-clock-pcom",
+        .dev.platform_data = &msm_clock_7x30_pdata,
+};