]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
clk: ux500: Register slimbus clock lookups for u8500
authorUlf Hansson <ulf.hansson@linaro.org>
Mon, 22 Oct 2012 13:58:01 +0000 (15:58 +0200)
committerMike Turquette <mturquette@linaro.org>
Mon, 12 Nov 2012 18:20:23 +0000 (10:20 -0800)
At the same time the prcc bit for the kclk is corrected to
bit 8 instead of 3.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
drivers/clk/ux500/u8500_clk.c

index 0aae92956844264f4795df749eaf0085f13bae13..e2c17d187d98b7bb09fe4252258641bbd424a1c5 100644 (file)
@@ -254,6 +254,7 @@ void u8500_clk_init(void)
 
        clk = clk_reg_prcc_pclk("p1_pclk8", "per1clk", U8500_CLKRST1_BASE,
                                BIT(8), 0);
+       clk_register_clkdev(clk, "apb_pclk", "slimbus0");
 
        clk = clk_reg_prcc_pclk("p1_pclk9", "per1clk", U8500_CLKRST1_BASE,
                                BIT(9), 0);
@@ -441,8 +442,8 @@ void u8500_clk_init(void)
        clk_register_clkdev(clk, NULL, "nmk-i2c.2");
 
        clk = clk_reg_prcc_kclk("p1_slimbus0_kclk", "slimclk",
-                       U8500_CLKRST1_BASE, BIT(3), CLK_SET_RATE_GATE);
-       /* FIXME: Redefinition of BIT(3). */
+                       U8500_CLKRST1_BASE, BIT(8), CLK_SET_RATE_GATE);
+       clk_register_clkdev(clk, NULL, "slimbus0");
 
        clk = clk_reg_prcc_kclk("p1_i2c4_kclk", "i2cclk",
                        U8500_CLKRST1_BASE, BIT(9), CLK_SET_RATE_GATE);