diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-01 12:22:47 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-01 12:22:47 -0700 |
commit | 68e952d5f9d145e43cc2c4baedd11fc55e1b7d60 (patch) | |
tree | bda26d01ac21064e1d88acc98beb455a6d69cb29 /drivers/clk/mvebu/armada-370.c | |
parent | 6920a1bd037374a632d585de127b6f945199dcb8 (diff) | |
parent | 2f9f64bc5aa31836810cd25301aa4772ad73ebab (diff) | |
download | op-kernel-dev-68e952d5f9d145e43cc2c4baedd11fc55e1b7d60.zip op-kernel-dev-68e952d5f9d145e43cc2c4baedd11fc55e1b7d60.tar.gz |
Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux
Pull clock subsystem fixes from Mike Turquette.
* tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux:
clk: fixup argument order when setting VCO parameters
clk: socfpga: Fix incorrect sdmmc clock name
clk: armada-370: fix tclk frequencies
clk: nomadik: set all timers to use 2.4 MHz TIMCLK
Diffstat (limited to 'drivers/clk/mvebu/armada-370.c')
-rw-r--r-- | drivers/clk/mvebu/armada-370.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/mvebu/armada-370.c b/drivers/clk/mvebu/armada-370.c index fc777bd..81a202d 100644 --- a/drivers/clk/mvebu/armada-370.c +++ b/drivers/clk/mvebu/armada-370.c @@ -39,8 +39,8 @@ static const struct coreclk_ratio a370_coreclk_ratios[] __initconst = { }; static const u32 a370_tclk_freqs[] __initconst = { - 16600000, - 20000000, + 166000000, + 200000000, }; static u32 __init a370_get_tclk_freq(void __iomem *sar) |