diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-04 17:26:02 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-04 17:26:02 +0200 |
| commit | 6724928c6972842b73962dc5af70d26de9969582 (patch) | |
| tree | 1ef3f1b2fe4fbc11f3f89fecade898aee8a66b08 /drivers/clk/mvebu/armada-370.c | |
| parent | 8da9a22b522f2b89f51f57b96295941c059e9c9d (diff) | |
| parent | 02e14a60abf6110234f01a16365657ecff37ab1e (diff) | |
| download | barebox-6724928c6972842b73962dc5af70d26de9969582.tar.gz barebox-6724928c6972842b73962dc5af70d26de9969582.tar.xz | |
Merge branch 'for-next/marvell'
Conflicts:
arch/arm/boards/Makefile
arch/arm/dts/Makefile
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 d189c6ca57..8d02ed93d9 100644 --- a/drivers/clk/mvebu/armada-370.c +++ b/drivers/clk/mvebu/armada-370.c @@ -37,8 +37,8 @@ static const struct coreclk_ratio a370_coreclk_ratios[] = { }; static const u32 a370_tclk_freqs[] = { - 16600000, - 20000000, + 166000000, + 200000000, }; static u32 a370_get_tclk_freq(void __iomem *sar) |