summaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-10-27 21:19:54 -0700
committerOlof Johansson <olof@lixom.net>2013-10-27 21:19:54 -0700
commitd31a408f4f48e2b7e65e8c0285eb5e669aa7600d (patch)
treec6f4358464cc88373ed944c70fdeef1c6f435e69 /drivers/clk
parent17761fc80fca546470708cd9bcffc37eaaeb2ff7 (diff)
parent6e1484c2761e56bb98ec95ccdd1d98d2f67852ae (diff)
downloadlinux-d31a408f4f48e2b7e65e8c0285eb5e669aa7600d.tar.bz2
Merge tag 'ux500-dt-for-v3.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt
From Linus Walleij: Five incremental device tree patches around the clock handling, and adding SSP/SPI devices to the device tree. * tag 'ux500-dt-for-v3.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: ux500: register all SSP and SPI blocks ARM: ux500: fix I2C4 clock bit ARM: ux500: fix clock for GPIO blocks 6 and 7 clk: ux500: fix erroneous bit assignment ARM: ux500: fix clock for GPIO block 8 Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/ux500/u8500_of_clk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/ux500/u8500_of_clk.c b/drivers/clk/ux500/u8500_of_clk.c
index b768b507c95c..cdeff299de26 100644
--- a/drivers/clk/ux500/u8500_of_clk.c
+++ b/drivers/clk/ux500/u8500_of_clk.c
@@ -339,7 +339,7 @@ void u8500_of_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
clk = clk_reg_prcc_pclk("p2_pclk11", "per2clk", clkrst2_base,
BIT(11), 0);
- PRCC_PCLK_STORE(clk, 2, 1);
+ PRCC_PCLK_STORE(clk, 2, 11);
clk = clk_reg_prcc_pclk("p2_pclk12", "per2clk", clkrst2_base,
BIT(12), 0);