diff options
Diffstat (limited to 'arch/arm/mach-ux500/clock.c')
-rw-r--r-- | arch/arm/mach-ux500/clock.c | 203 |
1 files changed, 49 insertions, 154 deletions
diff --git a/arch/arm/mach-ux500/clock.c b/arch/arm/mach-ux500/clock.c index e832664d1bd9..2ebf998bc77d 100644 --- a/arch/arm/mach-ux500/clock.c +++ b/arch/arm/mach-ux500/clock.c | |||
@@ -239,23 +239,6 @@ static void clk_prcmu_disable(struct clk *clk) | |||
239 | writel(1 << clk->prcmu_cg_bit, cg_clr_reg); | 239 | writel(1 << clk->prcmu_cg_bit, cg_clr_reg); |
240 | } | 240 | } |
241 | 241 | ||
242 | /* ED doesn't have the combined set/clr registers */ | ||
243 | static void clk_prcmu_ed_enable(struct clk *clk) | ||
244 | { | ||
245 | void __iomem *addr = __io_address(U8500_PRCMU_BASE) | ||
246 | + clk->prcmu_cg_mgt; | ||
247 | |||
248 | writel(readl(addr) | PRCM_MGT_ENABLE, addr); | ||
249 | } | ||
250 | |||
251 | static void clk_prcmu_ed_disable(struct clk *clk) | ||
252 | { | ||
253 | void __iomem *addr = __io_address(U8500_PRCMU_BASE) | ||
254 | + clk->prcmu_cg_mgt; | ||
255 | |||
256 | writel(readl(addr) & ~PRCM_MGT_ENABLE, addr); | ||
257 | } | ||
258 | |||
259 | static struct clkops clk_prcmu_ops = { | 242 | static struct clkops clk_prcmu_ops = { |
260 | .enable = clk_prcmu_enable, | 243 | .enable = clk_prcmu_enable, |
261 | .disable = clk_prcmu_disable, | 244 | .disable = clk_prcmu_disable, |
@@ -267,7 +250,6 @@ static unsigned int clkrst_base[] = { | |||
267 | [3] = U8500_CLKRST3_BASE, | 250 | [3] = U8500_CLKRST3_BASE, |
268 | [5] = U8500_CLKRST5_BASE, | 251 | [5] = U8500_CLKRST5_BASE, |
269 | [6] = U8500_CLKRST6_BASE, | 252 | [6] = U8500_CLKRST6_BASE, |
270 | [7] = U8500_CLKRST7_BASE_ED, | ||
271 | }; | 253 | }; |
272 | 254 | ||
273 | static void clk_prcc_enable(struct clk *clk) | 255 | static void clk_prcc_enable(struct clk *clk) |
@@ -321,7 +303,6 @@ static DEFINE_PRCMU_CLK(per2clk, 0x0, 12, PER2CLK); | |||
321 | static DEFINE_PRCMU_CLK(per3clk, 0x0, 13, PER3CLK); | 303 | static DEFINE_PRCMU_CLK(per3clk, 0x0, 13, PER3CLK); |
322 | static DEFINE_PRCMU_CLK(per5clk, 0x0, 14, PER5CLK); | 304 | static DEFINE_PRCMU_CLK(per5clk, 0x0, 14, PER5CLK); |
323 | static DEFINE_PRCMU_CLK_RATE(per6clk, 0x0, 15, PER6CLK, 133330000); | 305 | static DEFINE_PRCMU_CLK_RATE(per6clk, 0x0, 15, PER6CLK, 133330000); |
324 | static DEFINE_PRCMU_CLK_RATE(per7clk, 0x0, 16, PER7CLK, 100000000); | ||
325 | static DEFINE_PRCMU_CLK(lcdclk, 0x0, 17, LCDCLK); | 306 | static DEFINE_PRCMU_CLK(lcdclk, 0x0, 17, LCDCLK); |
326 | static DEFINE_PRCMU_CLK(bmlclk, 0x0, 18, BMLCLK); | 307 | static DEFINE_PRCMU_CLK(bmlclk, 0x0, 18, BMLCLK); |
327 | static DEFINE_PRCMU_CLK(hsitxclk, 0x0, 19, HSITXCLK); | 308 | static DEFINE_PRCMU_CLK(hsitxclk, 0x0, 19, HSITXCLK); |
@@ -351,44 +332,28 @@ static DEFINE_PRCMU_CLK(uiccclk, 0x4, 1, UICCCLK); /* v1 */ | |||
351 | static DEFINE_PRCC_CLK(1, i2c4, 10, 9, &clk_i2cclk); | 332 | static DEFINE_PRCC_CLK(1, i2c4, 10, 9, &clk_i2cclk); |
352 | static DEFINE_PRCC_CLK(1, gpio0, 9, -1, NULL); | 333 | static DEFINE_PRCC_CLK(1, gpio0, 9, -1, NULL); |
353 | static DEFINE_PRCC_CLK(1, slimbus0, 8, 8, &clk_slimclk); | 334 | static DEFINE_PRCC_CLK(1, slimbus0, 8, 8, &clk_slimclk); |
354 | static DEFINE_PRCC_CLK(1, spi3_ed, 7, 7, NULL); | 335 | static DEFINE_PRCC_CLK(1, spi3, 7, -1, NULL); |
355 | static DEFINE_PRCC_CLK(1, spi3_v1, 7, -1, NULL); | ||
356 | static DEFINE_PRCC_CLK(1, i2c2, 6, 6, &clk_i2cclk); | 336 | static DEFINE_PRCC_CLK(1, i2c2, 6, 6, &clk_i2cclk); |
357 | static DEFINE_PRCC_CLK(1, sdi0, 5, 5, &clk_sdmmcclk); | 337 | static DEFINE_PRCC_CLK(1, sdi0, 5, 5, &clk_sdmmcclk); |
358 | static DEFINE_PRCC_CLK(1, msp1_ed, 4, 4, &clk_msp02clk); | 338 | static DEFINE_PRCC_CLK(1, msp1, 4, 4, &clk_msp1clk); |
359 | static DEFINE_PRCC_CLK(1, msp1_v1, 4, 4, &clk_msp1clk); | ||
360 | static DEFINE_PRCC_CLK(1, msp0, 3, 3, &clk_msp02clk); | 339 | static DEFINE_PRCC_CLK(1, msp0, 3, 3, &clk_msp02clk); |
361 | static DEFINE_PRCC_CLK(1, i2c1, 2, 2, &clk_i2cclk); | 340 | static DEFINE_PRCC_CLK(1, i2c1, 2, 2, &clk_i2cclk); |
362 | static DEFINE_PRCC_CLK(1, uart1, 1, 1, &clk_uartclk); | 341 | static DEFINE_PRCC_CLK(1, uart1, 1, 1, &clk_uartclk); |
363 | static DEFINE_PRCC_CLK(1, uart0, 0, 0, &clk_uartclk); | 342 | static DEFINE_PRCC_CLK(1, uart0, 0, 0, &clk_uartclk); |
364 | 343 | ||
365 | /* Peripheral Cluster #2 */ | 344 | /* Peripheral Cluster #2 */ |
366 | 345 | static DEFINE_PRCC_CLK(2, gpio1, 11, -1, NULL); | |
367 | static DEFINE_PRCC_CLK(2, gpio1_ed, 12, -1, NULL); | 346 | static DEFINE_PRCC_CLK(2, ssitx, 10, 7, NULL); |
368 | static DEFINE_PRCC_CLK(2, ssitx_ed, 11, -1, NULL); | 347 | static DEFINE_PRCC_CLK(2, ssirx, 9, 6, NULL); |
369 | static DEFINE_PRCC_CLK(2, ssirx_ed, 10, -1, NULL); | 348 | static DEFINE_PRCC_CLK(2, spi0, 8, -1, NULL); |
370 | static DEFINE_PRCC_CLK(2, spi0_ed, 9, -1, NULL); | 349 | static DEFINE_PRCC_CLK(2, sdi3, 7, 5, &clk_sdmmcclk); |
371 | static DEFINE_PRCC_CLK(2, sdi3_ed, 8, 6, &clk_sdmmcclk); | 350 | static DEFINE_PRCC_CLK(2, sdi1, 6, 4, &clk_sdmmcclk); |
372 | static DEFINE_PRCC_CLK(2, sdi1_ed, 7, 5, &clk_sdmmcclk); | 351 | static DEFINE_PRCC_CLK(2, msp2, 5, 3, &clk_msp02clk); |
373 | static DEFINE_PRCC_CLK(2, msp2_ed, 6, 4, &clk_msp02clk); | 352 | static DEFINE_PRCC_CLK(2, sdi4, 4, 2, &clk_sdmmcclk); |
374 | static DEFINE_PRCC_CLK(2, sdi4_ed, 4, 2, &clk_sdmmcclk); | 353 | static DEFINE_PRCC_CLK(2, pwl, 3, 1, NULL); |
375 | static DEFINE_PRCC_CLK(2, pwl_ed, 3, 1, NULL); | 354 | static DEFINE_PRCC_CLK(2, spi1, 2, -1, NULL); |
376 | static DEFINE_PRCC_CLK(2, spi1_ed, 2, -1, NULL); | 355 | static DEFINE_PRCC_CLK(2, spi2, 1, -1, NULL); |
377 | static DEFINE_PRCC_CLK(2, spi2_ed, 1, -1, NULL); | 356 | static DEFINE_PRCC_CLK(2, i2c3, 0, 0, &clk_i2cclk); |
378 | static DEFINE_PRCC_CLK(2, i2c3_ed, 0, 0, &clk_i2cclk); | ||
379 | |||
380 | static DEFINE_PRCC_CLK(2, gpio1_v1, 11, -1, NULL); | ||
381 | static DEFINE_PRCC_CLK(2, ssitx_v1, 10, 7, NULL); | ||
382 | static DEFINE_PRCC_CLK(2, ssirx_v1, 9, 6, NULL); | ||
383 | static DEFINE_PRCC_CLK(2, spi0_v1, 8, -1, NULL); | ||
384 | static DEFINE_PRCC_CLK(2, sdi3_v1, 7, 5, &clk_sdmmcclk); | ||
385 | static DEFINE_PRCC_CLK(2, sdi1_v1, 6, 4, &clk_sdmmcclk); | ||
386 | static DEFINE_PRCC_CLK(2, msp2_v1, 5, 3, &clk_msp02clk); | ||
387 | static DEFINE_PRCC_CLK(2, sdi4_v1, 4, 2, &clk_sdmmcclk); | ||
388 | static DEFINE_PRCC_CLK(2, pwl_v1, 3, 1, NULL); | ||
389 | static DEFINE_PRCC_CLK(2, spi1_v1, 2, -1, NULL); | ||
390 | static DEFINE_PRCC_CLK(2, spi2_v1, 1, -1, NULL); | ||
391 | static DEFINE_PRCC_CLK(2, i2c3_v1, 0, 0, &clk_i2cclk); | ||
392 | 357 | ||
393 | /* Peripheral Cluster #3 */ | 358 | /* Peripheral Cluster #3 */ |
394 | static DEFINE_PRCC_CLK(3, gpio2, 8, -1, NULL); | 359 | static DEFINE_PRCC_CLK(3, gpio2, 8, -1, NULL); |
@@ -397,49 +362,34 @@ static DEFINE_PRCC_CLK(3, uart2, 6, 6, &clk_uartclk); | |||
397 | static DEFINE_PRCC_CLK(3, ske, 5, 5, &clk_32khz); | 362 | static DEFINE_PRCC_CLK(3, ske, 5, 5, &clk_32khz); |
398 | static DEFINE_PRCC_CLK(3, sdi2, 4, 4, &clk_sdmmcclk); | 363 | static DEFINE_PRCC_CLK(3, sdi2, 4, 4, &clk_sdmmcclk); |
399 | static DEFINE_PRCC_CLK(3, i2c0, 3, 3, &clk_i2cclk); | 364 | static DEFINE_PRCC_CLK(3, i2c0, 3, 3, &clk_i2cclk); |
400 | static DEFINE_PRCC_CLK(3, ssp1_ed, 2, 2, &clk_i2cclk); | 365 | static DEFINE_PRCC_CLK(3, ssp1, 2, 2, &clk_sspclk); |
401 | static DEFINE_PRCC_CLK(3, ssp0_ed, 1, 1, &clk_i2cclk); | 366 | static DEFINE_PRCC_CLK(3, ssp0, 1, 1, &clk_sspclk); |
402 | static DEFINE_PRCC_CLK(3, ssp1_v1, 2, 2, &clk_sspclk); | ||
403 | static DEFINE_PRCC_CLK(3, ssp0_v1, 1, 1, &clk_sspclk); | ||
404 | static DEFINE_PRCC_CLK(3, fsmc, 0, -1, NULL); | 367 | static DEFINE_PRCC_CLK(3, fsmc, 0, -1, NULL); |
405 | 368 | ||
406 | /* Peripheral Cluster #4 is in the always on domain */ | 369 | /* Peripheral Cluster #4 is in the always on domain */ |
407 | 370 | ||
408 | /* Peripheral Cluster #5 */ | 371 | /* Peripheral Cluster #5 */ |
409 | static DEFINE_PRCC_CLK(5, gpio3, 1, -1, NULL); | 372 | static DEFINE_PRCC_CLK(5, gpio3, 1, -1, NULL); |
410 | static DEFINE_PRCC_CLK(5, usb_ed, 0, 0, &clk_i2cclk); | 373 | static DEFINE_PRCC_CLK(5, usb, 0, 0, NULL); |
411 | static DEFINE_PRCC_CLK(5, usb_v1, 0, 0, NULL); | ||
412 | 374 | ||
413 | /* Peripheral Cluster #6 */ | 375 | /* Peripheral Cluster #6 */ |
414 | 376 | ||
415 | /* MTU ID in data */ | 377 | /* MTU ID in data */ |
416 | static DEFINE_PRCC_CLK_CUSTOM(6, mtu1_v1, 8, -1, NULL, clk_mtu_get_rate, 1); | 378 | static DEFINE_PRCC_CLK_CUSTOM(6, mtu1, 8, -1, NULL, clk_mtu_get_rate, 1); |
417 | static DEFINE_PRCC_CLK_CUSTOM(6, mtu0_v1, 7, -1, NULL, clk_mtu_get_rate, 0); | 379 | static DEFINE_PRCC_CLK_CUSTOM(6, mtu0, 7, -1, NULL, clk_mtu_get_rate, 0); |
418 | static DEFINE_PRCC_CLK(6, cfgreg_v1, 6, 6, NULL); | 380 | static DEFINE_PRCC_CLK(6, cfgreg, 6, 6, NULL); |
419 | static DEFINE_PRCC_CLK(6, dmc_ed, 6, 6, NULL); | ||
420 | static DEFINE_PRCC_CLK(6, hash1, 5, -1, NULL); | 381 | static DEFINE_PRCC_CLK(6, hash1, 5, -1, NULL); |
421 | static DEFINE_PRCC_CLK(6, unipro_v1, 4, 1, &clk_uniproclk); | 382 | static DEFINE_PRCC_CLK(6, unipro, 4, 1, &clk_uniproclk); |
422 | static DEFINE_PRCC_CLK(6, cryp1_ed, 4, -1, NULL); | ||
423 | static DEFINE_PRCC_CLK(6, pka, 3, -1, NULL); | 383 | static DEFINE_PRCC_CLK(6, pka, 3, -1, NULL); |
424 | static DEFINE_PRCC_CLK(6, hash0, 2, -1, NULL); | 384 | static DEFINE_PRCC_CLK(6, hash0, 2, -1, NULL); |
425 | static DEFINE_PRCC_CLK(6, cryp0, 1, -1, NULL); | 385 | static DEFINE_PRCC_CLK(6, cryp0, 1, -1, NULL); |
426 | static DEFINE_PRCC_CLK(6, rng_ed, 0, 0, &clk_i2cclk); | 386 | static DEFINE_PRCC_CLK(6, rng, 0, 0, &clk_rngclk); |
427 | static DEFINE_PRCC_CLK(6, rng_v1, 0, 0, &clk_rngclk); | ||
428 | |||
429 | /* Peripheral Cluster #7 */ | ||
430 | |||
431 | static DEFINE_PRCC_CLK(7, tzpc0_ed, 4, -1, NULL); | ||
432 | /* MTU ID in data */ | ||
433 | static DEFINE_PRCC_CLK_CUSTOM(7, mtu1_ed, 3, -1, NULL, clk_mtu_get_rate, 1); | ||
434 | static DEFINE_PRCC_CLK_CUSTOM(7, mtu0_ed, 2, -1, NULL, clk_mtu_get_rate, 0); | ||
435 | static DEFINE_PRCC_CLK(7, wdg_ed, 1, -1, NULL); | ||
436 | static DEFINE_PRCC_CLK(7, cfgreg_ed, 0, -1, NULL); | ||
437 | 387 | ||
438 | static struct clk clk_dummy_apb_pclk = { | 388 | static struct clk clk_dummy_apb_pclk = { |
439 | .name = "apb_pclk", | 389 | .name = "apb_pclk", |
440 | }; | 390 | }; |
441 | 391 | ||
442 | static struct clk_lookup u8500_common_clks[] = { | 392 | static struct clk_lookup u8500_clks[] = { |
443 | CLK(dummy_apb_pclk, NULL, "apb_pclk"), | 393 | CLK(dummy_apb_pclk, NULL, "apb_pclk"), |
444 | 394 | ||
445 | /* Peripheral Cluster #1 */ | 395 | /* Peripheral Cluster #1 */ |
@@ -494,83 +444,41 @@ static struct clk_lookup u8500_common_clks[] = { | |||
494 | CLK(dmaclk, "dma40.0", NULL), | 444 | CLK(dmaclk, "dma40.0", NULL), |
495 | CLK(b2r2clk, "b2r2", NULL), | 445 | CLK(b2r2clk, "b2r2", NULL), |
496 | CLK(tvclk, "tv", NULL), | 446 | CLK(tvclk, "tv", NULL), |
497 | }; | ||
498 | 447 | ||
499 | static struct clk_lookup u8500_ed_clks[] = { | ||
500 | /* Peripheral Cluster #1 */ | ||
501 | CLK(spi3_ed, "spi3", NULL), | ||
502 | CLK(msp1_ed, "msp1", NULL), | ||
503 | |||
504 | /* Peripheral Cluster #2 */ | ||
505 | CLK(gpio1_ed, "gpio.6", NULL), | ||
506 | CLK(gpio1_ed, "gpio.7", NULL), | ||
507 | CLK(ssitx_ed, "ssitx", NULL), | ||
508 | CLK(ssirx_ed, "ssirx", NULL), | ||
509 | CLK(spi0_ed, "spi0", NULL), | ||
510 | CLK(sdi3_ed, "sdi3", NULL), | ||
511 | CLK(sdi1_ed, "sdi1", NULL), | ||
512 | CLK(msp2_ed, "msp2", NULL), | ||
513 | CLK(sdi4_ed, "sdi4", NULL), | ||
514 | CLK(pwl_ed, "pwl", NULL), | ||
515 | CLK(spi1_ed, "spi1", NULL), | ||
516 | CLK(spi2_ed, "spi2", NULL), | ||
517 | CLK(i2c3_ed, "nmk-i2c.3", NULL), | ||
518 | |||
519 | /* Peripheral Cluster #3 */ | ||
520 | CLK(ssp1_ed, "ssp1", NULL), | ||
521 | CLK(ssp0_ed, "ssp0", NULL), | ||
522 | |||
523 | /* Peripheral Cluster #5 */ | ||
524 | CLK(usb_ed, "musb-ux500.0", "usb"), | ||
525 | |||
526 | /* Peripheral Cluster #6 */ | ||
527 | CLK(dmc_ed, "dmc", NULL), | ||
528 | CLK(cryp1_ed, "cryp1", NULL), | ||
529 | CLK(rng_ed, "rng", NULL), | ||
530 | |||
531 | /* Peripheral Cluster #7 */ | ||
532 | CLK(tzpc0_ed, "tzpc0", NULL), | ||
533 | CLK(mtu1_ed, "mtu1", NULL), | ||
534 | CLK(mtu0_ed, "mtu0", NULL), | ||
535 | CLK(wdg_ed, "wdg", NULL), | ||
536 | CLK(cfgreg_ed, "cfgreg", NULL), | ||
537 | }; | ||
538 | |||
539 | static struct clk_lookup u8500_v1_clks[] = { | ||
540 | /* Peripheral Cluster #1 */ | 448 | /* Peripheral Cluster #1 */ |
541 | CLK(i2c4, "nmk-i2c.4", NULL), | 449 | CLK(i2c4, "nmk-i2c.4", NULL), |
542 | CLK(spi3_v1, "spi3", NULL), | 450 | CLK(spi3, "spi3", NULL), |
543 | CLK(msp1_v1, "msp1", NULL), | 451 | CLK(msp1, "msp1", NULL), |
544 | 452 | ||
545 | /* Peripheral Cluster #2 */ | 453 | /* Peripheral Cluster #2 */ |
546 | CLK(gpio1_v1, "gpio.6", NULL), | 454 | CLK(gpio1, "gpio.6", NULL), |
547 | CLK(gpio1_v1, "gpio.7", NULL), | 455 | CLK(gpio1, "gpio.7", NULL), |
548 | CLK(ssitx_v1, "ssitx", NULL), | 456 | CLK(ssitx, "ssitx", NULL), |
549 | CLK(ssirx_v1, "ssirx", NULL), | 457 | CLK(ssirx, "ssirx", NULL), |
550 | CLK(spi0_v1, "spi0", NULL), | 458 | CLK(spi0, "spi0", NULL), |
551 | CLK(sdi3_v1, "sdi3", NULL), | 459 | CLK(sdi3, "sdi3", NULL), |
552 | CLK(sdi1_v1, "sdi1", NULL), | 460 | CLK(sdi1, "sdi1", NULL), |
553 | CLK(msp2_v1, "msp2", NULL), | 461 | CLK(msp2, "msp2", NULL), |
554 | CLK(sdi4_v1, "sdi4", NULL), | 462 | CLK(sdi4, "sdi4", NULL), |
555 | CLK(pwl_v1, "pwl", NULL), | 463 | CLK(pwl, "pwl", NULL), |
556 | CLK(spi1_v1, "spi1", NULL), | 464 | CLK(spi1, "spi1", NULL), |
557 | CLK(spi2_v1, "spi2", NULL), | 465 | CLK(spi2, "spi2", NULL), |
558 | CLK(i2c3_v1, "nmk-i2c.3", NULL), | 466 | CLK(i2c3, "nmk-i2c.3", NULL), |
559 | 467 | ||
560 | /* Peripheral Cluster #3 */ | 468 | /* Peripheral Cluster #3 */ |
561 | CLK(ssp1_v1, "ssp1", NULL), | 469 | CLK(ssp1, "ssp1", NULL), |
562 | CLK(ssp0_v1, "ssp0", NULL), | 470 | CLK(ssp0, "ssp0", NULL), |
563 | 471 | ||
564 | /* Peripheral Cluster #5 */ | 472 | /* Peripheral Cluster #5 */ |
565 | CLK(usb_v1, "musb-ux500.0", "usb"), | 473 | CLK(usb, "musb-ux500.0", "usb"), |
566 | 474 | ||
567 | /* Peripheral Cluster #6 */ | 475 | /* Peripheral Cluster #6 */ |
568 | CLK(mtu1_v1, "mtu1", NULL), | 476 | CLK(mtu1, "mtu1", NULL), |
569 | CLK(mtu0_v1, "mtu0", NULL), | 477 | CLK(mtu0, "mtu0", NULL), |
570 | CLK(cfgreg_v1, "cfgreg", NULL), | 478 | CLK(cfgreg, "cfgreg", NULL), |
571 | CLK(hash1, "hash1", NULL), | 479 | CLK(hash1, "hash1", NULL), |
572 | CLK(unipro_v1, "unipro", NULL), | 480 | CLK(unipro, "unipro", NULL), |
573 | CLK(rng_v1, "rng", NULL), | 481 | CLK(rng, "rng", NULL), |
574 | 482 | ||
575 | /* PRCMU level clock gating */ | 483 | /* PRCMU level clock gating */ |
576 | 484 | ||
@@ -790,11 +698,7 @@ late_initcall(clk_init_smp_twd_cpufreq); | |||
790 | 698 | ||
791 | int __init clk_init(void) | 699 | int __init clk_init(void) |
792 | { | 700 | { |
793 | if (cpu_is_u8500ed()) { | 701 | if (cpu_is_u5500()) { |
794 | clk_prcmu_ops.enable = clk_prcmu_ed_enable; | ||
795 | clk_prcmu_ops.disable = clk_prcmu_ed_disable; | ||
796 | clk_per6clk.rate = 100000000; | ||
797 | } else if (cpu_is_u5500()) { | ||
798 | /* Clock tree for U5500 not implemented yet */ | 702 | /* Clock tree for U5500 not implemented yet */ |
799 | clk_prcc_ops.enable = clk_prcc_ops.disable = NULL; | 703 | clk_prcc_ops.enable = clk_prcc_ops.disable = NULL; |
800 | clk_prcmu_ops.enable = clk_prcmu_ops.disable = NULL; | 704 | clk_prcmu_ops.enable = clk_prcmu_ops.disable = NULL; |
@@ -802,20 +706,11 @@ int __init clk_init(void) | |||
802 | clk_sdmmcclk.rate = 99900000; | 706 | clk_sdmmcclk.rate = 99900000; |
803 | } | 707 | } |
804 | 708 | ||
805 | clkdev_add_table(u8500_common_clks, ARRAY_SIZE(u8500_common_clks)); | 709 | clkdev_add_table(u8500_clks, ARRAY_SIZE(u8500_clks)); |
806 | if (cpu_is_u8500ed()) | ||
807 | clkdev_add_table(u8500_ed_clks, ARRAY_SIZE(u8500_ed_clks)); | ||
808 | else | ||
809 | clkdev_add_table(u8500_v1_clks, ARRAY_SIZE(u8500_v1_clks)); | ||
810 | |||
811 | clkdev_add(&clk_smp_twd_lookup); | 710 | clkdev_add(&clk_smp_twd_lookup); |
812 | 711 | ||
813 | #ifdef CONFIG_DEBUG_FS | 712 | #ifdef CONFIG_DEBUG_FS |
814 | clk_debugfs_add_table(u8500_common_clks, ARRAY_SIZE(u8500_common_clks)); | 713 | clk_debugfs_add_table(u8500_clks, ARRAY_SIZE(u8500_clks)); |
815 | if (cpu_is_u8500ed()) | ||
816 | clk_debugfs_add_table(u8500_ed_clks, ARRAY_SIZE(u8500_ed_clks)); | ||
817 | else | ||
818 | clk_debugfs_add_table(u8500_v1_clks, ARRAY_SIZE(u8500_v1_clks)); | ||
819 | #endif | 714 | #endif |
820 | return 0; | 715 | return 0; |
821 | } | 716 | } |