diff options
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r-- | arch/arm/mach-omap1/clock_data.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c index edefb3440d30..cea91cdf624d 100644 --- a/arch/arm/mach-omap1/clock_data.c +++ b/arch/arm/mach-omap1/clock_data.c | |||
@@ -530,7 +530,7 @@ static struct clk bclk_16xx = { | |||
530 | }; | 530 | }; |
531 | 531 | ||
532 | static struct clk mmc1_ck = { | 532 | static struct clk mmc1_ck = { |
533 | .name = "mmc_ck", | 533 | .name = "mmc1_ck", |
534 | .ops = &clkops_generic, | 534 | .ops = &clkops_generic, |
535 | /* Functional clock is direct from ULPD, interface clock is ARMPER */ | 535 | /* Functional clock is direct from ULPD, interface clock is ARMPER */ |
536 | .parent = &armper_ck.clk, | 536 | .parent = &armper_ck.clk, |
@@ -541,8 +541,7 @@ static struct clk mmc1_ck = { | |||
541 | }; | 541 | }; |
542 | 542 | ||
543 | static struct clk mmc2_ck = { | 543 | static struct clk mmc2_ck = { |
544 | .name = "mmc_ck", | 544 | .name = "mmc2_ck", |
545 | .id = 1, | ||
546 | .ops = &clkops_generic, | 545 | .ops = &clkops_generic, |
547 | /* Functional clock is direct from ULPD, interface clock is ARMPER */ | 546 | /* Functional clock is direct from ULPD, interface clock is ARMPER */ |
548 | .parent = &armper_ck.clk, | 547 | .parent = &armper_ck.clk, |
@@ -553,8 +552,7 @@ static struct clk mmc2_ck = { | |||
553 | }; | 552 | }; |
554 | 553 | ||
555 | static struct clk mmc3_ck = { | 554 | static struct clk mmc3_ck = { |
556 | .name = "mmc_ck", | 555 | .name = "mmc3_ck", |
557 | .id = 2, | ||
558 | .ops = &clkops_generic, | 556 | .ops = &clkops_generic, |
559 | /* Functional clock is direct from ULPD, interface clock is ARMPER */ | 557 | /* Functional clock is direct from ULPD, interface clock is ARMPER */ |
560 | .parent = &armper_ck.clk, | 558 | .parent = &armper_ck.clk, |
@@ -577,7 +575,6 @@ static struct clk virtual_ck_mpu = { | |||
577 | remains active during MPU idle whenever this is enabled */ | 575 | remains active during MPU idle whenever this is enabled */ |
578 | static struct clk i2c_fck = { | 576 | static struct clk i2c_fck = { |
579 | .name = "i2c_fck", | 577 | .name = "i2c_fck", |
580 | .id = 1, | ||
581 | .ops = &clkops_null, | 578 | .ops = &clkops_null, |
582 | .flags = CLOCK_NO_IDLE_PARENT, | 579 | .flags = CLOCK_NO_IDLE_PARENT, |
583 | .parent = &armxor_ck.clk, | 580 | .parent = &armxor_ck.clk, |
@@ -586,7 +583,6 @@ static struct clk i2c_fck = { | |||
586 | 583 | ||
587 | static struct clk i2c_ick = { | 584 | static struct clk i2c_ick = { |
588 | .name = "i2c_ick", | 585 | .name = "i2c_ick", |
589 | .id = 1, | ||
590 | .ops = &clkops_null, | 586 | .ops = &clkops_null, |
591 | .flags = CLOCK_NO_IDLE_PARENT, | 587 | .flags = CLOCK_NO_IDLE_PARENT, |
592 | .parent = &armper_ck.clk, | 588 | .parent = &armper_ck.clk, |