msm: clock: Add support for more proc_comm clocks

Add support for the ce, codec_ssbi, uart clocks, and i2c clocks.

Reviewed-by: Saravana Kannan <skannan@codeaurora.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>

3 files changed, 11 insertions, 1 deletions

diff --git a/arch/arm/mach-msm/clock-pcom.h b/arch/arm/mach-msm/clock-pcom.h
index 17d027b23501..2c813f1dba23 100644
--- a/arch/arm/mach-msm/clock-pcom.h
+++ b/arch/arm/mach-msm/clock-pcom.h
@@ -132,8 +132,10 @@
 #define P_CSI1_P_CLK            97
 #define P_GSBI_CLK              98
 #define P_GSBI_P_CLK            99
+#define P_CE_CLK                100 /* Crypto engine */
+#define P_CODEC_SSBI_CLK        101
 
-#define P_NR_CLKS               100
+#define P_NR_CLKS               102
 
 struct clk_ops;
 extern struct clk_ops clk_ops_pcom;
diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c
index 5dc64afd9ae0..8bd730792ff0 100644
--- a/arch/arm/mach-msm/devices-msm7x30.c
+++ b/arch/arm/mach-msm/devices-msm7x30.c
@@ -133,6 +133,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),
diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c
index c08e48e65f06..4cbf89dda733 100644
--- a/arch/arm/mach-msm/devices-qsd8x50.c
+++ b/arch/arm/mach-msm/devices-qsd8x50.c
@@ -127,12 +127,14 @@ struct platform_device msm_device_hsusb_host = {
 
 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),
@@ -150,7 +152,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),