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, 3 insertions, 0 deletions

diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c
index d4c7afccbdb..cd4343bcf73 100644
--- a/arch/arm/mach-msm/devices-msm7x30.c
+++ b/arch/arm/mach-msm/devices-msm7x30.c
@@ -28,6 +28,7 @@
 #include <asm/mach/flash.h>
 
 #include "clock-pcom.h"
+#include "clock-7x30.h"
 
 #include <mach/mmc.h>
 
@@ -133,6 +134,8 @@ struct clk msm_clocks_7x30[] = {
         CLK_PCOM("adsp_clk",    ADSP_CLK,       NULL, 0),
         CLK_PCOM("cam_m_clk",   CAM_M_CLK,      NULL, 0),
         CLK_PCOM("camif_pad_pclk",      CAMIF_PAD_P_CLK,        NULL, OFF),
+        CLK_PCOM("ce_clk",      CE_CLK, NULL, 0),
+        CLK_PCOM("codec_ssbi_clk",      CODEC_SSBI_CLK, NULL, 0),
         CLK_PCOM("ebi1_clk",    EBI1_CLK,       NULL, CLK_MIN),
         CLK_PCOM("ecodec_clk",  ECODEC_CLK,     NULL, 0),
         CLK_PCOM("emdh_clk",    EMDH_CLK,       NULL, OFF | CLK_MINMAX),