1 files changed, 12 insertions, 11 deletions

diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c
index bd545f9e8c2..12d8deb78d9 100644
--- a/arch/arm/mach-msm/devices-qsd8x50.c
+++ b/arch/arm/mach-msm/devices-qsd8x50.c
@@ -15,8 +15,9 @@
 
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
-
+#include <linux/clkdev.h>
 #include <linux/dma-mapping.h>
+
 #include <mach/irqs.h>
 #include <mach/msm_iomap.h>
 #include <mach/dma.h>
@@ -314,7 +315,7 @@ int __init msm_add_sdcc(unsigned int controller,
         return platform_device_register(pdev);
 }
 
-struct clk msm_clocks_8x50[] = {
+struct clk_lookup msm_clocks_8x50[] = {
         CLK_PCOM("adm_clk",     ADM_CLK,        NULL, 0),
         CLK_PCOM("ce_clk",      CE_CLK,         NULL, 0),
         CLK_PCOM("ebi1_clk",    EBI1_CLK,       NULL, CLK_MIN),
@@ -336,14 +337,14 @@ struct clk msm_clocks_8x50[] = {
         CLK_PCOM("pbus_clk",    PBUS_CLK,       NULL, CLK_MIN),
         CLK_PCOM("pcm_clk",     PCM_CLK,        NULL, 0),
         CLK_PCOM("sdac_clk",    SDAC_CLK,       NULL, OFF),
-        CLK_PCOM("sdc_clk",     SDC1_CLK,       &msm_device_sdc1.dev, OFF),
-        CLK_PCOM("sdc_pclk",    SDC1_P_CLK,     &msm_device_sdc1.dev, OFF),
-        CLK_PCOM("sdc_clk",     SDC2_CLK,       &msm_device_sdc2.dev, OFF),
-        CLK_PCOM("sdc_pclk",    SDC2_P_CLK,     &msm_device_sdc2.dev, OFF),
-        CLK_PCOM("sdc_clk",     SDC3_CLK,       &msm_device_sdc3.dev, OFF),
-        CLK_PCOM("sdc_pclk",    SDC3_P_CLK,     &msm_device_sdc3.dev, OFF),
-        CLK_PCOM("sdc_clk",     SDC4_CLK,       &msm_device_sdc4.dev, OFF),
-        CLK_PCOM("sdc_pclk",    SDC4_P_CLK,     &msm_device_sdc4.dev, OFF),
+        CLK_PCOM("sdc_clk",     SDC1_CLK,       "msm_sdcc.1", OFF),
+        CLK_PCOM("sdc_pclk",    SDC1_P_CLK,     "msm_sdcc.1", OFF),
+        CLK_PCOM("sdc_clk",     SDC2_CLK,       "msm_sdcc.2", OFF),
+        CLK_PCOM("sdc_pclk",    SDC2_P_CLK,     "msm_sdcc.2", OFF),
+        CLK_PCOM("sdc_clk",     SDC3_CLK,       "msm_sdcc.3", OFF),
+        CLK_PCOM("sdc_pclk",    SDC3_P_CLK,     "msm_sdcc.3", OFF),
+        CLK_PCOM("sdc_clk",     SDC4_CLK,       "msm_sdcc.4", OFF),
+        CLK_PCOM("sdc_pclk",    SDC4_P_CLK,     "msm_sdcc.4", OFF),
         CLK_PCOM("spi_clk",     SPI_CLK,        NULL, 0),
         CLK_PCOM("tsif_clk",    TSIF_CLK,       NULL, 0),
         CLK_PCOM("tsif_ref_clk",        TSIF_REF_CLK,   NULL, 0),
@@ -351,7 +352,7 @@ struct clk msm_clocks_8x50[] = {
         CLK_PCOM("tv_enc_clk",  TV_ENC_CLK,     NULL, 0),
         CLK_PCOM("uart_clk",    UART1_CLK,      NULL, OFF),
         CLK_PCOM("uart_clk",    UART2_CLK,      NULL, 0),
-        CLK_PCOM("uart_clk",    UART3_CLK,      &msm_device_uart3.dev, OFF),
+        CLK_PCOM("uart_clk",    UART3_CLK,      "msm_serial.2", OFF),
         CLK_PCOM("uartdm_clk",  UART1DM_CLK,    NULL, OFF),
         CLK_PCOM("uartdm_clk",  UART2DM_CLK,    NULL, 0),
         CLK_PCOM("usb_hs_clk",  USB_HS_CLK,     NULL, OFF),