summaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2012-10-24 14:13:40 +0200
committerLinus Walleij <linus.walleij@stericsson.com>2012-11-15 14:51:29 +0100
commitdb5eb2daf717d5023ade51fd2a2f7bc0bfcffbde (patch)
treec112d043659c99161196d02268d7b3b2f9155826 /drivers/clk
parentc3b9d1db23c4ebd4d8a0964ebcf5f27d4eb8fa3f (diff)
downloadtalos-op-linux-db5eb2daf717d5023ade51fd2a2f7bc0bfcffbde.tar.gz
talos-op-linux-db5eb2daf717d5023ade51fd2a2f7bc0bfcffbde.zip
clk: ux500: Register mtu apb_pclocks
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Acked-by: Mike Turquette <mturquette@ti.com> Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/ux500/u8500_clk.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/clk/ux500/u8500_clk.c b/drivers/clk/ux500/u8500_clk.c
index ab30ce87614c..1f6bfb8f8737 100644
--- a/drivers/clk/ux500/u8500_clk.c
+++ b/drivers/clk/ux500/u8500_clk.c
@@ -160,12 +160,6 @@ void u8500_clk_init(void)
clk = clk_reg_prcmu_gate("uiccclk", NULL, PRCMU_UICCCLK, CLK_IS_ROOT);
clk_register_clkdev(clk, NULL, "uicc");
- /*
- * FIXME: The MTU clocks might need some kind of "parent muxed join"
- * and these have no K-clocks. For now, we ignore the missing
- * connection to the corresponding P-clocks, p6_mtu0_clk and
- * p6_mtu1_clk. Instead timclk is used which is the valid parent.
- */
clk = clk_reg_prcmu_gate("timclk", NULL, PRCMU_TIMCLK, CLK_IS_ROOT);
clk_register_clkdev(clk, NULL, "mtu0");
clk_register_clkdev(clk, NULL, "mtu1");
@@ -379,8 +373,11 @@ void u8500_clk_init(void)
clk = clk_reg_prcc_pclk("p6_pclk6", "per6clk", U8500_CLKRST6_BASE,
BIT(6), 0);
+ clk_register_clkdev(clk, "apb_pclk", "mtu0");
+
clk = clk_reg_prcc_pclk("p6_pclk7", "per6clk", U8500_CLKRST6_BASE,
BIT(7), 0);
+ clk_register_clkdev(clk, "apb_pclk", "mtu1");
/* PRCC K-clocks
*
OpenPOWER on IntegriCloud