Skip to content

Commit ee554b4

Browse files
author
Saravana Kannan
committed
[ARM] msm: clock: Add new list of supported clocks for 7x30.
The list of clocks is just a preliminary list and will change soon. Signed-off-by: Saravana Kannan <[email protected]>
1 parent 05bf3da commit ee554b4

File tree

3 files changed

+54
-7
lines changed

3 files changed

+54
-7
lines changed

‎arch/arm/mach-msm/board-msm7x30.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ static void __init msm7x30_map_io(void)
320320
{
321321
msm_shared_ram_phys = 0x00100000;
322322
msm_map_msm7x30_io();
323-
msm_clock_init(msm_clocks_8x50, msm_num_clocks_8x50);
323+
msm_clock_init(msm_clocks_7x30, msm_num_clocks_7x30);
324324
}
325325

326326
MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF")

‎arch/arm/mach-msm/devices.c

Lines changed: 50 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ struct clk msm_clocks_7x01a[] = {
685685
CLK_PCOM("ebi2_clk", EBI2_CLK, NULL, 0),
686686
CLK_PCOM("ecodec_clk", ECODEC_CLK, NULL, 0),
687687
CLK_PCOM("emdh_clk", EMDH_CLK, NULL, OFF | CLK_MINMAX),
688-
CLK_PCOM("gp_clk", GP_CLK, NULL, 0),
688+
CLK_PCOM("gp_clk", GP_CLK, NULL, 0),
689689
CLK_PCOM("grp_clk", GRP_CLK, NULL, OFF),
690690
CLK_PCOM("i2c_clk", I2C_CLK, &msm_device_i2c.dev, 0),
691691
CLK_PCOM("icodec_rx_clk", ICODEC_RX_CLK, NULL, 0),
@@ -730,7 +730,7 @@ struct clk msm_clocks_7x25[] = {
730730
CLK_PCOM("ebi1_clk", EBI1_CLK, NULL, CLK_MIN),
731731
CLK_PCOM("ebi2_clk", EBI2_CLK, NULL, 0),
732732
CLK_PCOM("ecodec_clk", ECODEC_CLK, NULL, 0),
733-
CLK_PCOM("gp_clk", GP_CLK, NULL, 0),
733+
CLK_PCOM("gp_clk", GP_CLK, NULL, 0),
734734
CLK_PCOM("i2c_clk", I2C_CLK, &msm_device_i2c.dev, 0),
735735
CLK_PCOM("icodec_rx_clk", ICODEC_RX_CLK, NULL, 0),
736736
CLK_PCOM("icodec_tx_clk", ICODEC_TX_CLK, NULL, 0),
@@ -739,7 +739,7 @@ struct clk msm_clocks_7x25[] = {
739739
CLK_PCOM("mdp_clk", MDP_CLK, NULL, OFF),
740740
CLK_PCOM("mdp_lcdc_pclk_clk", MDP_LCDC_PCLK_CLK, NULL, 0),
741741
CLK_PCOM("mdp_lcdc_pad_pclk_clk", MDP_LCDC_PAD_PCLK_CLK, NULL, 0),
742-
CLK_PCOM("mdp_vsync_clk", MDP_VSYNC_CLK, NULL, 0),
742+
CLK_PCOM("mdp_vsync_clk", MDP_VSYNC_CLK, NULL, 0),
743743
CLK_PCOM("pbus_clk", PBUS_CLK, NULL, CLK_MIN),
744744
CLK_PCOM("pcm_clk", PCM_CLK, NULL, 0),
745745
CLK_PCOM("mddi_clk", PMDH_CLK, NULL, OFF | CLK_MINMAX),
@@ -773,7 +773,7 @@ struct clk msm_clocks_7x27[] = {
773773
CLK_PCOM("ebi1_clk", EBI1_CLK, NULL, CLK_MIN),
774774
CLK_PCOM("ebi2_clk", EBI2_CLK, NULL, 0),
775775
CLK_PCOM("ecodec_clk", ECODEC_CLK, NULL, 0),
776-
CLK_PCOM("gp_clk", GP_CLK, NULL, 0),
776+
CLK_PCOM("gp_clk", GP_CLK, NULL, 0),
777777
CLK_PCOM("grp_clk", GRP_CLK, NULL, 0),
778778
CLK_PCOM("i2c_clk", I2C_CLK, &msm_device_i2c.dev, 0),
779779
CLK_PCOM("icodec_rx_clk", ICODEC_RX_CLK, NULL, 0),
@@ -783,7 +783,7 @@ struct clk msm_clocks_7x27[] = {
783783
CLK_PCOM("mdp_clk", MDP_CLK, NULL, OFF),
784784
CLK_PCOM("mdp_lcdc_pclk_clk", MDP_LCDC_PCLK_CLK, NULL, 0),
785785
CLK_PCOM("mdp_lcdc_pad_pclk_clk", MDP_LCDC_PAD_PCLK_CLK, NULL, 0),
786-
CLK_PCOM("mdp_vsync_clk", MDP_VSYNC_CLK, NULL, 0),
786+
CLK_PCOM("mdp_vsync_clk", MDP_VSYNC_CLK, NULL, 0),
787787
CLK_PCOM("pbus_clk", PBUS_CLK, NULL, CLK_MIN),
788788
CLK_PCOM("pcm_clk", PCM_CLK, NULL, 0),
789789
CLK_PCOM("mddi_clk", PMDH_CLK, NULL, OFF | CLK_MINMAX),
@@ -813,13 +813,57 @@ struct clk msm_clocks_7x27[] = {
813813

814814
unsigned msm_num_clocks_7x27 = ARRAY_SIZE(msm_clocks_7x27);
815815

816+
struct clk msm_clocks_7x30[] = {
817+
CLK_PCOM("adm_clk", ADM_CLK, NULL, 0),
818+
CLK_PCOM("adsp_clk", ADSP_CLK, NULL, 0),
819+
CLK_PCOM("ebi1_clk", EBI1_CLK, NULL, CLK_MIN),
820+
CLK_PCOM("ebi2_clk", EBI2_CLK, NULL, 0),
821+
CLK_PCOM("ecodec_clk", ECODEC_CLK, NULL, 0),
822+
CLK_PCOM("gp_clk", GP_CLK, NULL, 0),
823+
CLK_PCOM("grp_clk", GRP_CLK, NULL, 0),
824+
CLK_PCOM("i2c_clk", I2C_CLK, &msm_device_i2c.dev, 0),
825+
CLK_PCOM("imem_clk", IMEM_CLK, NULL, OFF),
826+
CLK_PCOM("mdc_clk", MDC_CLK, NULL, 0),
827+
CLK_PCOM("mdp_clk", MDP_CLK, NULL, OFF),
828+
CLK_PCOM("mdp_lcdc_pclk_clk", MDP_LCDC_PCLK_CLK, NULL, 0),
829+
CLK_PCOM("mdp_lcdc_pad_pclk_clk", MDP_LCDC_PAD_PCLK_CLK, NULL, 0),
830+
CLK_PCOM("mdp_vsync_clk", MDP_VSYNC_CLK, NULL, 0),
831+
CLK_PCOM("pbus_clk", PBUS_CLK, NULL, CLK_MIN),
832+
CLK_PCOM("pcm_clk", PCM_CLK, NULL, 0),
833+
CLK_PCOM("mddi_clk", PMDH_CLK, NULL, OFF | CLK_MINMAX),
834+
CLK_PCOM("sdac_clk", SDAC_CLK, NULL, OFF),
835+
CLK_PCOM("sdc_clk", SDC1_CLK, &msm_device_sdc1.dev, OFF),
836+
CLK_PCOM("sdc_pclk", SDC1_PCLK, &msm_device_sdc1.dev, OFF),
837+
CLK_PCOM("sdc_clk", SDC2_CLK, &msm_device_sdc2.dev, OFF),
838+
CLK_PCOM("sdc_pclk", SDC2_PCLK, &msm_device_sdc2.dev, OFF),
839+
CLK_PCOM("sdc_clk", SDC3_CLK, &msm_device_sdc3.dev, OFF),
840+
CLK_PCOM("sdc_pclk", SDC3_PCLK, &msm_device_sdc3.dev, OFF),
841+
CLK_PCOM("sdc_clk", SDC4_CLK, &msm_device_sdc4.dev, OFF),
842+
CLK_PCOM("sdc_pclk", SDC4_PCLK, &msm_device_sdc4.dev, OFF),
843+
CLK_PCOM("uart_clk", UART1_CLK, &msm_device_uart1.dev, OFF),
844+
CLK_PCOM("uart_clk", UART2_CLK, &msm_device_uart2.dev, 0),
845+
CLK_PCOM("uart_clk", UART3_CLK, &msm_device_uart3.dev, OFF),
846+
CLK_PCOM("uartdm_clk", UART1DM_CLK, &msm_device_uart_dm1.dev, OFF),
847+
CLK_PCOM("uartdm_clk", UART2DM_CLK, &msm_device_uart_dm2.dev, 0),
848+
CLK_PCOM("usb_hs_clk", USB_HS_CLK, NULL, OFF),
849+
CLK_PCOM("usb_hs_pclk", USB_HS_PCLK, NULL, OFF),
850+
CLK_PCOM("usb_otg_clk", USB_OTG_CLK, NULL, 0),
851+
CLK_PCOM("vdc_clk", VDC_CLK, NULL, OFF | CLK_MIN),
852+
CLK_PCOM("vfe_clk", VFE_CLK, NULL, OFF),
853+
CLK_PCOM("vfe_mdc_clk", VFE_MDC_CLK, NULL, OFF),
854+
CLK_PCOM("grp_pclk", GRP_PCLK, NULL, 0),
855+
CLK_PCOM("usb_phy_clk", USB_PHY_CLK, NULL, 0),
856+
};
857+
858+
unsigned msm_num_clocks_7x30 = ARRAY_SIZE(msm_clocks_7x30);
859+
816860
struct clk msm_clocks_8x50[] = {
817861
CLK_PCOM("adm_clk", ADM_CLK, NULL, 0),
818862
CLK_PCOM("ebi1_clk", EBI1_CLK, NULL, CLK_MIN),
819863
CLK_PCOM("ebi2_clk", EBI2_CLK, NULL, 0),
820864
CLK_PCOM("ecodec_clk", ECODEC_CLK, NULL, 0),
821865
CLK_PCOM("emdh_clk", EMDH_CLK, NULL, OFF | CLK_MINMAX),
822-
CLK_PCOM("gp_clk", GP_CLK, NULL, 0),
866+
CLK_PCOM("gp_clk", GP_CLK, NULL, 0),
823867
CLK_PCOM("grp_clk", GRP_CLK, NULL, 0),
824868
CLK_PCOM("i2c_clk", I2C_CLK, &msm_device_i2c.dev, 0),
825869
CLK_PCOM("icodec_rx_clk", ICODEC_RX_CLK, NULL, 0),

‎arch/arm/mach-msm/devices.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ extern unsigned msm_num_clocks_7x25;
5353
extern struct clk msm_clocks_7x27[];
5454
extern unsigned msm_num_clocks_7x27;
5555

56+
extern struct clk msm_clocks_7x30[];
57+
extern unsigned msm_num_clocks_7x30;
58+
5659
extern struct clk msm_clocks_8x50[];
5760
extern unsigned msm_num_clocks_8x50;
5861

0 commit comments

Comments
 (0)