Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus

[pandora-kernel.git] / arch / arm / mach-msm / devices-qsd8x50.c

diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c
index b1a8f0f..12d8deb 100644 (file)
--- a/arch/arm/mach-msm/devices-qsd8x50.c
+++ b/arch/arm/mach-msm/devices-qsd8x50.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2008 Google, Inc.
- * Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -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>
@@ -27,6 +28,7 @@
 #include <asm/mach/flash.h>
 
 #include <mach/mmc.h>
+#include "clock-pcom.h"
 
 static struct resource resources_uart3[] = {
        {
@@ -38,6 +40,7 @@ static struct resource resources_uart3[] = {
                .start  = MSM_UART3_PHYS,
                .end    = MSM_UART3_PHYS + MSM_UART3_SIZE - 1,
                .flags  = IORESOURCE_MEM,
+               .name  = "uart_resource"
        },
 };
 
@@ -312,14 +315,16 @@ 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),
        CLK_PCOM("ebi2_clk",    EBI2_CLK,       NULL, 0),
        CLK_PCOM("ecodec_clk",  ECODEC_CLK,     NULL, 0),
        CLK_PCOM("emdh_clk",    EMDH_CLK,       NULL, OFF | CLK_MINMAX),
        CLK_PCOM("gp_clk",      GP_CLK,         NULL, 0),
        CLK_PCOM("grp_clk",     GRP_3D_CLK,     NULL, 0),
+       CLK_PCOM("i2c_clk",     I2C_CLK,        NULL, 0),
        CLK_PCOM("icodec_rx_clk",       ICODEC_RX_CLK,  NULL, 0),
        CLK_PCOM("icodec_tx_clk",       ICODEC_TX_CLK,  NULL, 0),
        CLK_PCOM("imem_clk",    IMEM_CLK,       NULL, OFF),
@@ -332,20 +337,24 @@ 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),
        CLK_PCOM("tv_dac_clk",  TV_DAC_CLK,     NULL, 0),
        CLK_PCOM("tv_enc_clk",  TV_ENC_CLK,     NULL, 0),
-       CLK_PCOM("uart_clk",    UART3_CLK,      &msm_device_uart3.dev, OFF),
+       CLK_PCOM("uart_clk",    UART1_CLK,      NULL, OFF),
+       CLK_PCOM("uart_clk",    UART2_CLK,      NULL, 0),
+       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),
        CLK_PCOM("usb_hs_pclk", USB_HS_P_CLK,   NULL, OFF),
        CLK_PCOM("usb_otg_clk", USB_OTG_CLK,    NULL, 0),