diff options
-rw-r--r-- | arch/arm/mach-msm/clock-7x30.h | 155 | ||||
-rw-r--r-- | arch/arm/mach-msm/devices-msm7x30.c | 3 |
2 files changed, 0 insertions, 158 deletions
diff --git a/arch/arm/mach-msm/clock-7x30.h b/arch/arm/mach-msm/clock-7x30.h deleted file mode 100644 index 14104453688b..000000000000 --- a/arch/arm/mach-msm/clock-7x30.h +++ /dev/null | |||
@@ -1,155 +0,0 @@ | |||
1 | /* Copyright (c) 2009, Code Aurora Forum. All rights reserved. | ||
2 | * | ||
3 | * This program is free software; you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License version 2 and | ||
5 | * only version 2 as published by the Free Software Foundation. | ||
6 | * | ||
7 | * This program is distributed in the hope that it will be useful, | ||
8 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
9 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
10 | * GNU General Public License for more details. | ||
11 | */ | ||
12 | |||
13 | #ifndef __ARCH_ARM_MACH_MSM_CLOCK_7X30_H | ||
14 | #define __ARCH_ARM_MACH_MSM_CLOCK_7X30_H | ||
15 | |||
16 | enum { | ||
17 | L_7X30_NONE_CLK = -1, | ||
18 | L_7X30_ADM_CLK, | ||
19 | L_7X30_I2C_CLK, | ||
20 | L_7X30_I2C_2_CLK, | ||
21 | L_7X30_QUP_I2C_CLK, | ||
22 | L_7X30_UART1DM_CLK, | ||
23 | L_7X30_UART1DM_P_CLK, | ||
24 | L_7X30_UART2DM_CLK, | ||
25 | L_7X30_UART2DM_P_CLK, | ||
26 | L_7X30_EMDH_CLK, | ||
27 | L_7X30_EMDH_P_CLK, | ||
28 | L_7X30_PMDH_CLK, | ||
29 | L_7X30_PMDH_P_CLK, | ||
30 | L_7X30_GRP_2D_CLK, | ||
31 | L_7X30_GRP_2D_P_CLK, | ||
32 | L_7X30_GRP_3D_SRC_CLK, | ||
33 | L_7X30_GRP_3D_CLK, | ||
34 | L_7X30_GRP_3D_P_CLK, | ||
35 | L_7X30_IMEM_CLK, | ||
36 | L_7X30_SDC1_CLK, | ||
37 | L_7X30_SDC1_P_CLK, | ||
38 | L_7X30_SDC2_CLK, | ||
39 | L_7X30_SDC2_P_CLK, | ||
40 | L_7X30_SDC3_CLK, | ||
41 | L_7X30_SDC3_P_CLK, | ||
42 | L_7X30_SDC4_CLK, | ||
43 | L_7X30_SDC4_P_CLK, | ||
44 | L_7X30_MDP_CLK, | ||
45 | L_7X30_MDP_P_CLK, | ||
46 | L_7X30_MDP_LCDC_PCLK_CLK, | ||
47 | L_7X30_MDP_LCDC_PAD_PCLK_CLK, | ||
48 | L_7X30_MDP_VSYNC_CLK, | ||
49 | L_7X30_MI2S_CODEC_RX_M_CLK, | ||
50 | L_7X30_MI2S_CODEC_RX_S_CLK, | ||
51 | L_7X30_MI2S_CODEC_TX_M_CLK, | ||
52 | L_7X30_MI2S_CODEC_TX_S_CLK, | ||
53 | L_7X30_MI2S_M_CLK, | ||
54 | L_7X30_MI2S_S_CLK, | ||
55 | L_7X30_LPA_CODEC_CLK, | ||
56 | L_7X30_LPA_CORE_CLK, | ||
57 | L_7X30_LPA_P_CLK, | ||
58 | L_7X30_MIDI_CLK, | ||
59 | L_7X30_MDC_CLK, | ||
60 | L_7X30_ROTATOR_IMEM_CLK, | ||
61 | L_7X30_ROTATOR_P_CLK, | ||
62 | L_7X30_SDAC_M_CLK, | ||
63 | L_7X30_SDAC_CLK, | ||
64 | L_7X30_UART1_CLK, | ||
65 | L_7X30_UART2_CLK, | ||
66 | L_7X30_UART3_CLK, | ||
67 | L_7X30_TV_CLK, | ||
68 | L_7X30_TV_DAC_CLK, | ||
69 | L_7X30_TV_ENC_CLK, | ||
70 | L_7X30_HDMI_CLK, | ||
71 | L_7X30_TSIF_REF_CLK, | ||
72 | L_7X30_TSIF_P_CLK, | ||
73 | L_7X30_USB_HS_SRC_CLK, | ||
74 | L_7X30_USB_HS_CLK, | ||
75 | L_7X30_USB_HS_CORE_CLK, | ||
76 | L_7X30_USB_HS_P_CLK, | ||
77 | L_7X30_USB_HS2_CLK, | ||
78 | L_7X30_USB_HS2_CORE_CLK, | ||
79 | L_7X30_USB_HS2_P_CLK, | ||
80 | L_7X30_USB_HS3_CLK, | ||
81 | L_7X30_USB_HS3_CORE_CLK, | ||
82 | L_7X30_USB_HS3_P_CLK, | ||
83 | L_7X30_VFE_CLK, | ||
84 | L_7X30_VFE_P_CLK, | ||
85 | L_7X30_VFE_MDC_CLK, | ||
86 | L_7X30_VFE_CAMIF_CLK, | ||
87 | L_7X30_CAMIF_PAD_P_CLK, | ||
88 | L_7X30_CAM_M_CLK, | ||
89 | L_7X30_JPEG_CLK, | ||
90 | L_7X30_JPEG_P_CLK, | ||
91 | L_7X30_VPE_CLK, | ||
92 | L_7X30_MFC_CLK, | ||
93 | L_7X30_MFC_DIV2_CLK, | ||
94 | L_7X30_MFC_P_CLK, | ||
95 | L_7X30_SPI_CLK, | ||
96 | L_7X30_SPI_P_CLK, | ||
97 | L_7X30_CSI0_CLK, | ||
98 | L_7X30_CSI0_VFE_CLK, | ||
99 | L_7X30_CSI0_P_CLK, | ||
100 | L_7X30_CSI1_CLK, | ||
101 | L_7X30_CSI1_VFE_CLK, | ||
102 | L_7X30_CSI1_P_CLK, | ||
103 | L_7X30_GLBL_ROOT_CLK, | ||
104 | |||
105 | L_7X30_AXI_LI_VG_CLK, | ||
106 | L_7X30_AXI_LI_GRP_CLK, | ||
107 | L_7X30_AXI_LI_JPEG_CLK, | ||
108 | L_7X30_AXI_GRP_2D_CLK, | ||
109 | L_7X30_AXI_MFC_CLK, | ||
110 | L_7X30_AXI_VPE_CLK, | ||
111 | L_7X30_AXI_LI_VFE_CLK, | ||
112 | L_7X30_AXI_LI_APPS_CLK, | ||
113 | L_7X30_AXI_MDP_CLK, | ||
114 | L_7X30_AXI_IMEM_CLK, | ||
115 | L_7X30_AXI_LI_ADSP_A_CLK, | ||
116 | L_7X30_AXI_ROTATOR_CLK, | ||
117 | |||
118 | L_7X30_NR_CLKS | ||
119 | }; | ||
120 | |||
121 | struct clk_ops; | ||
122 | extern struct clk_ops clk_ops_7x30; | ||
123 | |||
124 | struct clk_ops *clk_7x30_is_local(uint32_t id); | ||
125 | int clk_7x30_init(void); | ||
126 | |||
127 | void pll_enable(uint32_t pll); | ||
128 | void pll_disable(uint32_t pll); | ||
129 | |||
130 | extern int internal_pwr_rail_ctl_auto(unsigned rail_id, bool enable); | ||
131 | |||
132 | #define CLK_7X30(clk_name, clk_id, clk_dev, clk_flags) { \ | ||
133 | .con_id = clk_name, \ | ||
134 | .dev_id = clk_dev, \ | ||
135 | .clk = &(struct clk){ \ | ||
136 | .id = L_7X30_##clk_id, \ | ||
137 | .remote_id = P_##clk_id, \ | ||
138 | .flags = clk_flags, \ | ||
139 | .dbg_name = #clk_id, \ | ||
140 | }, \ | ||
141 | } | ||
142 | |||
143 | #define CLK_7X30S(clk_name, l_id, r_id, clk_dev, clk_flags) { \ | ||
144 | .con_id = clk_name, \ | ||
145 | .dev_id = clk_dev, \ | ||
146 | .clk = &(struct clk){ \ | ||
147 | .id = L_7X30_##l_id, \ | ||
148 | .remote_id = P_##r_id, \ | ||
149 | .flags = clk_flags, \ | ||
150 | .dbg_name = #l_id, \ | ||
151 | .ops = &clk_ops_pcom, \ | ||
152 | }, \ | ||
153 | } | ||
154 | |||
155 | #endif | ||
diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c index 12f482c07740..d233c515973d 100644 --- a/arch/arm/mach-msm/devices-msm7x30.c +++ b/arch/arm/mach-msm/devices-msm7x30.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <asm/mach/flash.h> | 29 | #include <asm/mach/flash.h> |
30 | 30 | ||
31 | #include "clock-pcom.h" | 31 | #include "clock-pcom.h" |
32 | #include "clock-7x30.h" | ||
33 | 32 | ||
34 | #include <linux/platform_data/mmc-msm_sdcc.h> | 33 | #include <linux/platform_data/mmc-msm_sdcc.h> |
35 | 34 | ||
@@ -177,7 +176,6 @@ struct clk_lookup msm_clocks_7x30[] = { | |||
177 | CLK_PCOM("grp_2d_pclk", GRP_2D_P_CLK, NULL, 0), | 176 | CLK_PCOM("grp_2d_pclk", GRP_2D_P_CLK, NULL, 0), |
178 | CLK_PCOM("grp_clk", GRP_3D_CLK, NULL, 0), | 177 | CLK_PCOM("grp_clk", GRP_3D_CLK, NULL, 0), |
179 | CLK_PCOM("grp_pclk", GRP_3D_P_CLK, NULL, 0), | 178 | CLK_PCOM("grp_pclk", GRP_3D_P_CLK, NULL, 0), |
180 | CLK_7X30S("grp_src_clk", GRP_3D_SRC_CLK, GRP_3D_CLK, NULL, 0), | ||
181 | CLK_PCOM("hdmi_clk", HDMI_CLK, NULL, 0), | 179 | CLK_PCOM("hdmi_clk", HDMI_CLK, NULL, 0), |
182 | CLK_PCOM("imem_clk", IMEM_CLK, NULL, OFF), | 180 | CLK_PCOM("imem_clk", IMEM_CLK, NULL, OFF), |
183 | CLK_PCOM("jpeg_clk", JPEG_CLK, NULL, OFF), | 181 | CLK_PCOM("jpeg_clk", JPEG_CLK, NULL, OFF), |
@@ -210,7 +208,6 @@ struct clk_lookup msm_clocks_7x30[] = { | |||
210 | CLK_PCOM("sdac_clk", SDAC_CLK, NULL, OFF), | 208 | CLK_PCOM("sdac_clk", SDAC_CLK, NULL, OFF), |
211 | CLK_PCOM("spi_clk", SPI_CLK, NULL, 0), | 209 | CLK_PCOM("spi_clk", SPI_CLK, NULL, 0), |
212 | CLK_PCOM("spi_pclk", SPI_P_CLK, NULL, 0), | 210 | CLK_PCOM("spi_pclk", SPI_P_CLK, NULL, 0), |
213 | CLK_7X30S("tv_src_clk", TV_CLK, TV_ENC_CLK, NULL, 0), | ||
214 | CLK_PCOM("tv_dac_clk", TV_DAC_CLK, NULL, 0), | 211 | CLK_PCOM("tv_dac_clk", TV_DAC_CLK, NULL, 0), |
215 | CLK_PCOM("tv_enc_clk", TV_ENC_CLK, NULL, 0), | 212 | CLK_PCOM("tv_enc_clk", TV_ENC_CLK, NULL, 0), |
216 | CLK_PCOM("uart_clk", UART2_CLK, "msm_serial.1", 0), | 213 | CLK_PCOM("uart_clk", UART2_CLK, "msm_serial.1", 0), |