diff options
author | Thomas Abraham <thomas.ab@samsung.com> | 2011-06-14 06:12:27 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-07-20 06:11:30 -0400 |
commit | d8b22d25b738075a02201287a59561036da1a49b (patch) | |
tree | aa383ad3e52bfd624fab7dcb0a12ccf53c42b538 /arch/arm/mach-s5p64x0/clock-s5p6450.c | |
parent | 226e85f4dad0cdb2353b438b5dfedffba60f15b5 (diff) |
ARM: S5P64X0: Add clkdev support
Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5p64x0/clock-s5p6450.c')
-rw-r--r-- | arch/arm/mach-s5p64x0/clock-s5p6450.c | 68 |
1 files changed, 19 insertions, 49 deletions
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6450.c b/arch/arm/mach-s5p64x0/clock-s5p6450.c index 4eec457ddccc..d9dc16cde109 100644 --- a/arch/arm/mach-s5p64x0/clock-s5p6450.c +++ b/arch/arm/mach-s5p64x0/clock-s5p6450.c | |||
@@ -36,7 +36,6 @@ | |||
36 | static struct clksrc_clk clk_mout_dpll = { | 36 | static struct clksrc_clk clk_mout_dpll = { |
37 | .clk = { | 37 | .clk = { |
38 | .name = "mout_dpll", | 38 | .name = "mout_dpll", |
39 | .id = -1, | ||
40 | }, | 39 | }, |
41 | .sources = &clk_src_dpll, | 40 | .sources = &clk_src_dpll, |
42 | .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 5, .size = 1 }, | 41 | .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 5, .size = 1 }, |
@@ -96,7 +95,6 @@ static struct clk_ops s5p6450_epll_ops = { | |||
96 | static struct clksrc_clk clk_dout_epll = { | 95 | static struct clksrc_clk clk_dout_epll = { |
97 | .clk = { | 96 | .clk = { |
98 | .name = "dout_epll", | 97 | .name = "dout_epll", |
99 | .id = -1, | ||
100 | .parent = &clk_mout_epll.clk, | 98 | .parent = &clk_mout_epll.clk, |
101 | }, | 99 | }, |
102 | .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 24, .size = 4 }, | 100 | .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 24, .size = 4 }, |
@@ -105,7 +103,6 @@ static struct clksrc_clk clk_dout_epll = { | |||
105 | static struct clksrc_clk clk_mout_hclk_sel = { | 103 | static struct clksrc_clk clk_mout_hclk_sel = { |
106 | .clk = { | 104 | .clk = { |
107 | .name = "mout_hclk_sel", | 105 | .name = "mout_hclk_sel", |
108 | .id = -1, | ||
109 | }, | 106 | }, |
110 | .sources = &clkset_hclk_low, | 107 | .sources = &clkset_hclk_low, |
111 | .reg_src = { .reg = S5P64X0_OTHERS, .shift = 15, .size = 1 }, | 108 | .reg_src = { .reg = S5P64X0_OTHERS, .shift = 15, .size = 1 }, |
@@ -124,7 +121,6 @@ static struct clksrc_sources clkset_hclk = { | |||
124 | static struct clksrc_clk clk_hclk = { | 121 | static struct clksrc_clk clk_hclk = { |
125 | .clk = { | 122 | .clk = { |
126 | .name = "clk_hclk", | 123 | .name = "clk_hclk", |
127 | .id = -1, | ||
128 | }, | 124 | }, |
129 | .sources = &clkset_hclk, | 125 | .sources = &clkset_hclk, |
130 | .reg_src = { .reg = S5P64X0_OTHERS, .shift = 14, .size = 1 }, | 126 | .reg_src = { .reg = S5P64X0_OTHERS, .shift = 14, .size = 1 }, |
@@ -134,7 +130,6 @@ static struct clksrc_clk clk_hclk = { | |||
134 | static struct clksrc_clk clk_pclk = { | 130 | static struct clksrc_clk clk_pclk = { |
135 | .clk = { | 131 | .clk = { |
136 | .name = "clk_pclk", | 132 | .name = "clk_pclk", |
137 | .id = -1, | ||
138 | .parent = &clk_hclk.clk, | 133 | .parent = &clk_hclk.clk, |
139 | }, | 134 | }, |
140 | .reg_div = { .reg = S5P64X0_CLK_DIV0, .shift = 12, .size = 4 }, | 135 | .reg_div = { .reg = S5P64X0_CLK_DIV0, .shift = 12, .size = 4 }, |
@@ -142,7 +137,6 @@ static struct clksrc_clk clk_pclk = { | |||
142 | static struct clksrc_clk clk_dout_pwm_ratio0 = { | 137 | static struct clksrc_clk clk_dout_pwm_ratio0 = { |
143 | .clk = { | 138 | .clk = { |
144 | .name = "clk_dout_pwm_ratio0", | 139 | .name = "clk_dout_pwm_ratio0", |
145 | .id = -1, | ||
146 | .parent = &clk_mout_hclk_sel.clk, | 140 | .parent = &clk_mout_hclk_sel.clk, |
147 | }, | 141 | }, |
148 | .reg_div = { .reg = S5P64X0_CLK_DIV3, .shift = 16, .size = 4 }, | 142 | .reg_div = { .reg = S5P64X0_CLK_DIV3, .shift = 16, .size = 4 }, |
@@ -151,7 +145,6 @@ static struct clksrc_clk clk_dout_pwm_ratio0 = { | |||
151 | static struct clksrc_clk clk_pclk_to_wdt_pwm = { | 145 | static struct clksrc_clk clk_pclk_to_wdt_pwm = { |
152 | .clk = { | 146 | .clk = { |
153 | .name = "clk_pclk_to_wdt_pwm", | 147 | .name = "clk_pclk_to_wdt_pwm", |
154 | .id = -1, | ||
155 | .parent = &clk_dout_pwm_ratio0.clk, | 148 | .parent = &clk_dout_pwm_ratio0.clk, |
156 | }, | 149 | }, |
157 | .reg_div = { .reg = S5P64X0_CLK_DIV3, .shift = 20, .size = 4 }, | 150 | .reg_div = { .reg = S5P64X0_CLK_DIV3, .shift = 20, .size = 4 }, |
@@ -160,7 +153,6 @@ static struct clksrc_clk clk_pclk_to_wdt_pwm = { | |||
160 | static struct clksrc_clk clk_hclk_low = { | 153 | static struct clksrc_clk clk_hclk_low = { |
161 | .clk = { | 154 | .clk = { |
162 | .name = "clk_hclk_low", | 155 | .name = "clk_hclk_low", |
163 | .id = -1, | ||
164 | }, | 156 | }, |
165 | .sources = &clkset_hclk_low, | 157 | .sources = &clkset_hclk_low, |
166 | .reg_src = { .reg = S5P64X0_OTHERS, .shift = 6, .size = 1 }, | 158 | .reg_src = { .reg = S5P64X0_OTHERS, .shift = 6, .size = 1 }, |
@@ -170,7 +162,6 @@ static struct clksrc_clk clk_hclk_low = { | |||
170 | static struct clksrc_clk clk_pclk_low = { | 162 | static struct clksrc_clk clk_pclk_low = { |
171 | .clk = { | 163 | .clk = { |
172 | .name = "clk_pclk_low", | 164 | .name = "clk_pclk_low", |
173 | .id = -1, | ||
174 | .parent = &clk_hclk_low.clk, | 165 | .parent = &clk_hclk_low.clk, |
175 | }, | 166 | }, |
176 | .reg_div = { .reg = S5P64X0_CLK_DIV3, .shift = 12, .size = 4 }, | 167 | .reg_div = { .reg = S5P64X0_CLK_DIV3, .shift = 12, .size = 4 }, |
@@ -184,109 +175,101 @@ static struct clksrc_clk clk_pclk_low = { | |||
184 | static struct clk init_clocks_off[] = { | 175 | static struct clk init_clocks_off[] = { |
185 | { | 176 | { |
186 | .name = "usbhost", | 177 | .name = "usbhost", |
187 | .id = -1, | ||
188 | .parent = &clk_hclk_low.clk, | 178 | .parent = &clk_hclk_low.clk, |
189 | .enable = s5p64x0_hclk0_ctrl, | 179 | .enable = s5p64x0_hclk0_ctrl, |
190 | .ctrlbit = (1 << 3), | 180 | .ctrlbit = (1 << 3), |
191 | }, { | 181 | }, { |
192 | .name = "pdma", | 182 | .name = "pdma", |
193 | .id = -1, | ||
194 | .parent = &clk_hclk_low.clk, | 183 | .parent = &clk_hclk_low.clk, |
195 | .enable = s5p64x0_hclk0_ctrl, | 184 | .enable = s5p64x0_hclk0_ctrl, |
196 | .ctrlbit = (1 << 12), | 185 | .ctrlbit = (1 << 12), |
197 | }, { | 186 | }, { |
198 | .name = "hsmmc", | 187 | .name = "hsmmc", |
199 | .id = 0, | 188 | .devname = "s3c-sdhci.0", |
200 | .parent = &clk_hclk_low.clk, | 189 | .parent = &clk_hclk_low.clk, |
201 | .enable = s5p64x0_hclk0_ctrl, | 190 | .enable = s5p64x0_hclk0_ctrl, |
202 | .ctrlbit = (1 << 17), | 191 | .ctrlbit = (1 << 17), |
203 | }, { | 192 | }, { |
204 | .name = "hsmmc", | 193 | .name = "hsmmc", |
205 | .id = 1, | 194 | .devname = "s3c-sdhci.1", |
206 | .parent = &clk_hclk_low.clk, | 195 | .parent = &clk_hclk_low.clk, |
207 | .enable = s5p64x0_hclk0_ctrl, | 196 | .enable = s5p64x0_hclk0_ctrl, |
208 | .ctrlbit = (1 << 18), | 197 | .ctrlbit = (1 << 18), |
209 | }, { | 198 | }, { |
210 | .name = "hsmmc", | 199 | .name = "hsmmc", |
211 | .id = 2, | 200 | .devname = "s3c-sdhci.2", |
212 | .parent = &clk_hclk_low.clk, | 201 | .parent = &clk_hclk_low.clk, |
213 | .enable = s5p64x0_hclk0_ctrl, | 202 | .enable = s5p64x0_hclk0_ctrl, |
214 | .ctrlbit = (1 << 19), | 203 | .ctrlbit = (1 << 19), |
215 | }, { | 204 | }, { |
216 | .name = "usbotg", | 205 | .name = "usbotg", |
217 | .id = -1, | ||
218 | .parent = &clk_hclk_low.clk, | 206 | .parent = &clk_hclk_low.clk, |
219 | .enable = s5p64x0_hclk0_ctrl, | 207 | .enable = s5p64x0_hclk0_ctrl, |
220 | .ctrlbit = (1 << 20), | 208 | .ctrlbit = (1 << 20), |
221 | }, { | 209 | }, { |
222 | .name = "lcd", | 210 | .name = "lcd", |
223 | .id = -1, | ||
224 | .parent = &clk_h, | 211 | .parent = &clk_h, |
225 | .enable = s5p64x0_hclk1_ctrl, | 212 | .enable = s5p64x0_hclk1_ctrl, |
226 | .ctrlbit = (1 << 1), | 213 | .ctrlbit = (1 << 1), |
227 | }, { | 214 | }, { |
228 | .name = "watchdog", | 215 | .name = "watchdog", |
229 | .id = -1, | ||
230 | .parent = &clk_pclk_low.clk, | 216 | .parent = &clk_pclk_low.clk, |
231 | .enable = s5p64x0_pclk_ctrl, | 217 | .enable = s5p64x0_pclk_ctrl, |
232 | .ctrlbit = (1 << 5), | 218 | .ctrlbit = (1 << 5), |
233 | }, { | 219 | }, { |
234 | .name = "rtc", | 220 | .name = "rtc", |
235 | .id = -1, | ||
236 | .parent = &clk_pclk_low.clk, | 221 | .parent = &clk_pclk_low.clk, |
237 | .enable = s5p64x0_pclk_ctrl, | 222 | .enable = s5p64x0_pclk_ctrl, |
238 | .ctrlbit = (1 << 6), | 223 | .ctrlbit = (1 << 6), |
239 | }, { | 224 | }, { |
240 | .name = "adc", | 225 | .name = "adc", |
241 | .id = -1, | ||
242 | .parent = &clk_pclk_low.clk, | 226 | .parent = &clk_pclk_low.clk, |
243 | .enable = s5p64x0_pclk_ctrl, | 227 | .enable = s5p64x0_pclk_ctrl, |
244 | .ctrlbit = (1 << 12), | 228 | .ctrlbit = (1 << 12), |
245 | }, { | 229 | }, { |
246 | .name = "i2c", | 230 | .name = "i2c", |
247 | .id = 0, | 231 | .devname = "s3c2440-i2c.0", |
248 | .parent = &clk_pclk_low.clk, | 232 | .parent = &clk_pclk_low.clk, |
249 | .enable = s5p64x0_pclk_ctrl, | 233 | .enable = s5p64x0_pclk_ctrl, |
250 | .ctrlbit = (1 << 17), | 234 | .ctrlbit = (1 << 17), |
251 | }, { | 235 | }, { |
252 | .name = "spi", | 236 | .name = "spi", |
253 | .id = 0, | 237 | .devname = "s3c64xx-spi.0", |
254 | .parent = &clk_pclk_low.clk, | 238 | .parent = &clk_pclk_low.clk, |
255 | .enable = s5p64x0_pclk_ctrl, | 239 | .enable = s5p64x0_pclk_ctrl, |
256 | .ctrlbit = (1 << 21), | 240 | .ctrlbit = (1 << 21), |
257 | }, { | 241 | }, { |
258 | .name = "spi", | 242 | .name = "spi", |
259 | .id = 1, | 243 | .devname = "s3c64xx-spi.1", |
260 | .parent = &clk_pclk_low.clk, | 244 | .parent = &clk_pclk_low.clk, |
261 | .enable = s5p64x0_pclk_ctrl, | 245 | .enable = s5p64x0_pclk_ctrl, |
262 | .ctrlbit = (1 << 22), | 246 | .ctrlbit = (1 << 22), |
263 | }, { | 247 | }, { |
264 | .name = "iis", | 248 | .name = "iis", |
265 | .id = 0, | 249 | .devname = "samsung-i2s.0", |
266 | .parent = &clk_pclk_low.clk, | 250 | .parent = &clk_pclk_low.clk, |
267 | .enable = s5p64x0_pclk_ctrl, | 251 | .enable = s5p64x0_pclk_ctrl, |
268 | .ctrlbit = (1 << 26), | 252 | .ctrlbit = (1 << 26), |
269 | }, { | 253 | }, { |
270 | .name = "iis", | 254 | .name = "iis", |
271 | .id = 1, | 255 | .devname = "samsung-i2s.1", |
272 | .parent = &clk_pclk_low.clk, | 256 | .parent = &clk_pclk_low.clk, |
273 | .enable = s5p64x0_pclk_ctrl, | 257 | .enable = s5p64x0_pclk_ctrl, |
274 | .ctrlbit = (1 << 15), | 258 | .ctrlbit = (1 << 15), |
275 | }, { | 259 | }, { |
276 | .name = "iis", | 260 | .name = "iis", |
277 | .id = 2, | 261 | .devname = "samsung-i2s.2", |
278 | .parent = &clk_pclk_low.clk, | 262 | .parent = &clk_pclk_low.clk, |
279 | .enable = s5p64x0_pclk_ctrl, | 263 | .enable = s5p64x0_pclk_ctrl, |
280 | .ctrlbit = (1 << 16), | 264 | .ctrlbit = (1 << 16), |
281 | }, { | 265 | }, { |
282 | .name = "i2c", | 266 | .name = "i2c", |
283 | .id = 1, | 267 | .devname = "s3c2440-i2c.1", |
284 | .parent = &clk_pclk_low.clk, | 268 | .parent = &clk_pclk_low.clk, |
285 | .enable = s5p64x0_pclk_ctrl, | 269 | .enable = s5p64x0_pclk_ctrl, |
286 | .ctrlbit = (1 << 27), | 270 | .ctrlbit = (1 << 27), |
287 | }, { | 271 | }, { |
288 | .name = "dmc0", | 272 | .name = "dmc0", |
289 | .id = -1, | ||
290 | .parent = &clk_pclk.clk, | 273 | .parent = &clk_pclk.clk, |
291 | .enable = s5p64x0_pclk_ctrl, | 274 | .enable = s5p64x0_pclk_ctrl, |
292 | .ctrlbit = (1 << 30), | 275 | .ctrlbit = (1 << 30), |
@@ -299,49 +282,45 @@ static struct clk init_clocks_off[] = { | |||
299 | static struct clk init_clocks[] = { | 282 | static struct clk init_clocks[] = { |
300 | { | 283 | { |
301 | .name = "intc", | 284 | .name = "intc", |
302 | .id = -1, | ||
303 | .parent = &clk_hclk.clk, | 285 | .parent = &clk_hclk.clk, |
304 | .enable = s5p64x0_hclk0_ctrl, | 286 | .enable = s5p64x0_hclk0_ctrl, |
305 | .ctrlbit = (1 << 1), | 287 | .ctrlbit = (1 << 1), |
306 | }, { | 288 | }, { |
307 | .name = "mem", | 289 | .name = "mem", |
308 | .id = -1, | ||
309 | .parent = &clk_hclk.clk, | 290 | .parent = &clk_hclk.clk, |
310 | .enable = s5p64x0_hclk0_ctrl, | 291 | .enable = s5p64x0_hclk0_ctrl, |
311 | .ctrlbit = (1 << 21), | 292 | .ctrlbit = (1 << 21), |
312 | }, { | 293 | }, { |
313 | .name = "uart", | 294 | .name = "uart", |
314 | .id = 0, | 295 | .devname = "s3c6400-uart.0", |
315 | .parent = &clk_pclk_low.clk, | 296 | .parent = &clk_pclk_low.clk, |
316 | .enable = s5p64x0_pclk_ctrl, | 297 | .enable = s5p64x0_pclk_ctrl, |
317 | .ctrlbit = (1 << 1), | 298 | .ctrlbit = (1 << 1), |
318 | }, { | 299 | }, { |
319 | .name = "uart", | 300 | .name = "uart", |
320 | .id = 1, | 301 | .devname = "s3c6400-uart.1", |
321 | .parent = &clk_pclk_low.clk, | 302 | .parent = &clk_pclk_low.clk, |
322 | .enable = s5p64x0_pclk_ctrl, | 303 | .enable = s5p64x0_pclk_ctrl, |
323 | .ctrlbit = (1 << 2), | 304 | .ctrlbit = (1 << 2), |
324 | }, { | 305 | }, { |
325 | .name = "uart", | 306 | .name = "uart", |
326 | .id = 2, | 307 | .devname = "s3c6400-uart.2", |
327 | .parent = &clk_pclk_low.clk, | 308 | .parent = &clk_pclk_low.clk, |
328 | .enable = s5p64x0_pclk_ctrl, | 309 | .enable = s5p64x0_pclk_ctrl, |
329 | .ctrlbit = (1 << 3), | 310 | .ctrlbit = (1 << 3), |
330 | }, { | 311 | }, { |
331 | .name = "uart", | 312 | .name = "uart", |
332 | .id = 3, | 313 | .devname = "s3c6400-uart.3", |
333 | .parent = &clk_pclk_low.clk, | 314 | .parent = &clk_pclk_low.clk, |
334 | .enable = s5p64x0_pclk_ctrl, | 315 | .enable = s5p64x0_pclk_ctrl, |
335 | .ctrlbit = (1 << 4), | 316 | .ctrlbit = (1 << 4), |
336 | }, { | 317 | }, { |
337 | .name = "timers", | 318 | .name = "timers", |
338 | .id = -1, | ||
339 | .parent = &clk_pclk_to_wdt_pwm.clk, | 319 | .parent = &clk_pclk_to_wdt_pwm.clk, |
340 | .enable = s5p64x0_pclk_ctrl, | 320 | .enable = s5p64x0_pclk_ctrl, |
341 | .ctrlbit = (1 << 7), | 321 | .ctrlbit = (1 << 7), |
342 | }, { | 322 | }, { |
343 | .name = "gpio", | 323 | .name = "gpio", |
344 | .id = -1, | ||
345 | .parent = &clk_pclk_low.clk, | 324 | .parent = &clk_pclk_low.clk, |
346 | .enable = s5p64x0_pclk_ctrl, | 325 | .enable = s5p64x0_pclk_ctrl, |
347 | .ctrlbit = (1 << 18), | 326 | .ctrlbit = (1 << 18), |
@@ -421,7 +400,6 @@ static struct clksrc_sources clkset_sclk_audio0 = { | |||
421 | static struct clksrc_clk clk_sclk_audio0 = { | 400 | static struct clksrc_clk clk_sclk_audio0 = { |
422 | .clk = { | 401 | .clk = { |
423 | .name = "audio-bus", | 402 | .name = "audio-bus", |
424 | .id = -1, | ||
425 | .enable = s5p64x0_sclk_ctrl, | 403 | .enable = s5p64x0_sclk_ctrl, |
426 | .ctrlbit = (1 << 8), | 404 | .ctrlbit = (1 << 8), |
427 | .parent = &clk_dout_epll.clk, | 405 | .parent = &clk_dout_epll.clk, |
@@ -435,7 +413,7 @@ static struct clksrc_clk clksrcs[] = { | |||
435 | { | 413 | { |
436 | .clk = { | 414 | .clk = { |
437 | .name = "sclk_mmc", | 415 | .name = "sclk_mmc", |
438 | .id = 0, | 416 | .devname = "s3c-sdhci.0", |
439 | .ctrlbit = (1 << 24), | 417 | .ctrlbit = (1 << 24), |
440 | .enable = s5p64x0_sclk_ctrl, | 418 | .enable = s5p64x0_sclk_ctrl, |
441 | }, | 419 | }, |
@@ -445,7 +423,7 @@ static struct clksrc_clk clksrcs[] = { | |||
445 | }, { | 423 | }, { |
446 | .clk = { | 424 | .clk = { |
447 | .name = "sclk_mmc", | 425 | .name = "sclk_mmc", |
448 | .id = 1, | 426 | .devname = "s3c-sdhci.1", |
449 | .ctrlbit = (1 << 25), | 427 | .ctrlbit = (1 << 25), |
450 | .enable = s5p64x0_sclk_ctrl, | 428 | .enable = s5p64x0_sclk_ctrl, |
451 | }, | 429 | }, |
@@ -455,7 +433,7 @@ static struct clksrc_clk clksrcs[] = { | |||
455 | }, { | 433 | }, { |
456 | .clk = { | 434 | .clk = { |
457 | .name = "sclk_mmc", | 435 | .name = "sclk_mmc", |
458 | .id = 2, | 436 | .devname = "s3c-sdhci.2", |
459 | .ctrlbit = (1 << 26), | 437 | .ctrlbit = (1 << 26), |
460 | .enable = s5p64x0_sclk_ctrl, | 438 | .enable = s5p64x0_sclk_ctrl, |
461 | }, | 439 | }, |
@@ -465,7 +443,6 @@ static struct clksrc_clk clksrcs[] = { | |||
465 | }, { | 443 | }, { |
466 | .clk = { | 444 | .clk = { |
467 | .name = "uclk1", | 445 | .name = "uclk1", |
468 | .id = -1, | ||
469 | .ctrlbit = (1 << 5), | 446 | .ctrlbit = (1 << 5), |
470 | .enable = s5p64x0_sclk_ctrl, | 447 | .enable = s5p64x0_sclk_ctrl, |
471 | }, | 448 | }, |
@@ -475,7 +452,7 @@ static struct clksrc_clk clksrcs[] = { | |||
475 | }, { | 452 | }, { |
476 | .clk = { | 453 | .clk = { |
477 | .name = "sclk_spi", | 454 | .name = "sclk_spi", |
478 | .id = 0, | 455 | .devname = "s3c64xx-spi.0", |
479 | .ctrlbit = (1 << 20), | 456 | .ctrlbit = (1 << 20), |
480 | .enable = s5p64x0_sclk_ctrl, | 457 | .enable = s5p64x0_sclk_ctrl, |
481 | }, | 458 | }, |
@@ -485,7 +462,7 @@ static struct clksrc_clk clksrcs[] = { | |||
485 | }, { | 462 | }, { |
486 | .clk = { | 463 | .clk = { |
487 | .name = "sclk_spi", | 464 | .name = "sclk_spi", |
488 | .id = 1, | 465 | .devname = "s3c64xx-spi.1", |
489 | .ctrlbit = (1 << 21), | 466 | .ctrlbit = (1 << 21), |
490 | .enable = s5p64x0_sclk_ctrl, | 467 | .enable = s5p64x0_sclk_ctrl, |
491 | }, | 468 | }, |
@@ -495,7 +472,6 @@ static struct clksrc_clk clksrcs[] = { | |||
495 | }, { | 472 | }, { |
496 | .clk = { | 473 | .clk = { |
497 | .name = "sclk_fimc", | 474 | .name = "sclk_fimc", |
498 | .id = -1, | ||
499 | .ctrlbit = (1 << 10), | 475 | .ctrlbit = (1 << 10), |
500 | .enable = s5p64x0_sclk_ctrl, | 476 | .enable = s5p64x0_sclk_ctrl, |
501 | }, | 477 | }, |
@@ -505,7 +481,6 @@ static struct clksrc_clk clksrcs[] = { | |||
505 | }, { | 481 | }, { |
506 | .clk = { | 482 | .clk = { |
507 | .name = "aclk_mali", | 483 | .name = "aclk_mali", |
508 | .id = -1, | ||
509 | .ctrlbit = (1 << 2), | 484 | .ctrlbit = (1 << 2), |
510 | .enable = s5p64x0_sclk1_ctrl, | 485 | .enable = s5p64x0_sclk1_ctrl, |
511 | }, | 486 | }, |
@@ -515,7 +490,6 @@ static struct clksrc_clk clksrcs[] = { | |||
515 | }, { | 490 | }, { |
516 | .clk = { | 491 | .clk = { |
517 | .name = "sclk_2d", | 492 | .name = "sclk_2d", |
518 | .id = -1, | ||
519 | .ctrlbit = (1 << 12), | 493 | .ctrlbit = (1 << 12), |
520 | .enable = s5p64x0_sclk_ctrl, | 494 | .enable = s5p64x0_sclk_ctrl, |
521 | }, | 495 | }, |
@@ -525,7 +499,6 @@ static struct clksrc_clk clksrcs[] = { | |||
525 | }, { | 499 | }, { |
526 | .clk = { | 500 | .clk = { |
527 | .name = "sclk_usi", | 501 | .name = "sclk_usi", |
528 | .id = -1, | ||
529 | .ctrlbit = (1 << 7), | 502 | .ctrlbit = (1 << 7), |
530 | .enable = s5p64x0_sclk_ctrl, | 503 | .enable = s5p64x0_sclk_ctrl, |
531 | }, | 504 | }, |
@@ -535,7 +508,6 @@ static struct clksrc_clk clksrcs[] = { | |||
535 | }, { | 508 | }, { |
536 | .clk = { | 509 | .clk = { |
537 | .name = "sclk_camif", | 510 | .name = "sclk_camif", |
538 | .id = -1, | ||
539 | .ctrlbit = (1 << 6), | 511 | .ctrlbit = (1 << 6), |
540 | .enable = s5p64x0_sclk_ctrl, | 512 | .enable = s5p64x0_sclk_ctrl, |
541 | }, | 513 | }, |
@@ -545,7 +517,6 @@ static struct clksrc_clk clksrcs[] = { | |||
545 | }, { | 517 | }, { |
546 | .clk = { | 518 | .clk = { |
547 | .name = "sclk_dispcon", | 519 | .name = "sclk_dispcon", |
548 | .id = -1, | ||
549 | .ctrlbit = (1 << 1), | 520 | .ctrlbit = (1 << 1), |
550 | .enable = s5p64x0_sclk1_ctrl, | 521 | .enable = s5p64x0_sclk1_ctrl, |
551 | }, | 522 | }, |
@@ -555,7 +526,6 @@ static struct clksrc_clk clksrcs[] = { | |||
555 | }, { | 526 | }, { |
556 | .clk = { | 527 | .clk = { |
557 | .name = "sclk_hsmmc44", | 528 | .name = "sclk_hsmmc44", |
558 | .id = -1, | ||
559 | .ctrlbit = (1 << 30), | 529 | .ctrlbit = (1 << 30), |
560 | .enable = s5p64x0_sclk_ctrl, | 530 | .enable = s5p64x0_sclk_ctrl, |
561 | }, | 531 | }, |