Merge branch 'msm-core' into for-next

* msm-core:
  msm: Clean up useless ifdefs
  msm: clock: Add support for more proc_comm clocks
  msm: clock: Invert debugfs directory layout
  msm: clock: Move debugfs code from clock.c to clock-debug.c
  msm: clock: Remove 7x30 and pcom includes from clock.h
  msm: clock: Remove unused code and definitions
  msm: Warning fix in trout gpio board file
  msm: Remove broken register definition from trout

1 files changed, 7 insertions, 0 deletions

diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c
index c9fa6552ff7d..bd545f9e8c29 100644
--- a/arch/arm/mach-msm/devices-qsd8x50.c
+++ b/arch/arm/mach-msm/devices-qsd8x50.c
@@ -27,6 +27,7 @@
 #include <asm/mach/flash.h>
 
 #include <mach/mmc.h>
+#include "clock-pcom.h"
 
 static struct resource resources_uart3[] = {
         {
@@ -315,12 +316,14 @@ int __init msm_add_sdcc(unsigned int controller,
 
 struct clk 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),
@@ -346,7 +349,11 @@ struct clk msm_clocks_8x50[] = {
         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",    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("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),