diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-20 06:44:46 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-12 12:32:39 -0500 |
commit | ebdbbf2003ae2342147c87c2a6c6ed8984b9cede (patch) | |
tree | 2d3228b7a0b556e00f9082a5f4d09d426d03f11b /arch | |
parent | 0321cb83e1c3f3a4282bd620c6cec78c5b80b572 (diff) |
ARM: PNX4008: convert i2c-pnx to use clk API enable/disable calls
clk_set_rate() is not supposed to be used to turn clocks on and off.
That's what clk_enable/clk_disable is for.
Acked-by: Vitaly Wool <vitalywool@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-pnx4008/clock.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-pnx4008/clock.c b/arch/arm/mach-pnx4008/clock.c index 5a1515210969..692625cd2001 100644 --- a/arch/arm/mach-pnx4008/clock.c +++ b/arch/arm/mach-pnx4008/clock.c | |||
@@ -639,30 +639,30 @@ static struct clk i2c0_ck = { | |||
639 | .name = "i2c0_ck", | 639 | .name = "i2c0_ck", |
640 | .parent = &per_ck, | 640 | .parent = &per_ck, |
641 | .flags = NEEDS_INITIALIZATION, | 641 | .flags = NEEDS_INITIALIZATION, |
642 | .round_rate = &on_off_round_rate, | ||
643 | .set_rate = &on_off_set_rate, | ||
644 | .enable_shift = 0, | 642 | .enable_shift = 0, |
645 | .enable_reg = I2CCLKCTRL_REG, | 643 | .enable_reg = I2CCLKCTRL_REG, |
644 | .enable = clk_reg_enable, | ||
645 | .disable = clk_reg_disable, | ||
646 | }; | 646 | }; |
647 | 647 | ||
648 | static struct clk i2c1_ck = { | 648 | static struct clk i2c1_ck = { |
649 | .name = "i2c1_ck", | 649 | .name = "i2c1_ck", |
650 | .parent = &per_ck, | 650 | .parent = &per_ck, |
651 | .flags = NEEDS_INITIALIZATION, | 651 | .flags = NEEDS_INITIALIZATION, |
652 | .round_rate = &on_off_round_rate, | ||
653 | .set_rate = &on_off_set_rate, | ||
654 | .enable_shift = 1, | 652 | .enable_shift = 1, |
655 | .enable_reg = I2CCLKCTRL_REG, | 653 | .enable_reg = I2CCLKCTRL_REG, |
654 | .enable = clk_reg_enable, | ||
655 | .disable = clk_reg_disable, | ||
656 | }; | 656 | }; |
657 | 657 | ||
658 | static struct clk i2c2_ck = { | 658 | static struct clk i2c2_ck = { |
659 | .name = "i2c2_ck", | 659 | .name = "i2c2_ck", |
660 | .parent = &per_ck, | 660 | .parent = &per_ck, |
661 | .flags = NEEDS_INITIALIZATION, | 661 | .flags = NEEDS_INITIALIZATION, |
662 | .round_rate = &on_off_round_rate, | ||
663 | .set_rate = &on_off_set_rate, | ||
664 | .enable_shift = 2, | 662 | .enable_shift = 2, |
665 | .enable_reg = USB_OTG_CLKCTRL_REG, | 663 | .enable_reg = USB_OTG_CLKCTRL_REG, |
664 | .enable = clk_reg_enable, | ||
665 | .disable = clk_reg_disable, | ||
666 | }; | 666 | }; |
667 | 667 | ||
668 | static struct clk spi0_ck = { | 668 | static struct clk spi0_ck = { |