diff options
Diffstat (limited to 'drivers/clk/ux500/u8500_clk.c')
-rw-r--r-- | drivers/clk/ux500/u8500_clk.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/clk/ux500/u8500_clk.c b/drivers/clk/ux500/u8500_clk.c index 7d0e0258f204..6b889a0e90b3 100644 --- a/drivers/clk/ux500/u8500_clk.c +++ b/drivers/clk/ux500/u8500_clk.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <linux/clk-provider.h> | 12 | #include <linux/clk-provider.h> |
13 | #include <linux/mfd/dbx500-prcmu.h> | 13 | #include <linux/mfd/dbx500-prcmu.h> |
14 | #include <linux/platform_data/clk-ux500.h> | 14 | #include <linux/platform_data/clk-ux500.h> |
15 | 15 | #include <mach/db8500-regs.h> | |
16 | #include "clk.h" | 16 | #include "clk.h" |
17 | 17 | ||
18 | void u8500_clk_init(void) | 18 | void u8500_clk_init(void) |
@@ -160,12 +160,6 @@ void u8500_clk_init(void) | |||
160 | clk = clk_reg_prcmu_gate("uiccclk", NULL, PRCMU_UICCCLK, CLK_IS_ROOT); | 160 | clk = clk_reg_prcmu_gate("uiccclk", NULL, PRCMU_UICCCLK, CLK_IS_ROOT); |
161 | clk_register_clkdev(clk, NULL, "uicc"); | 161 | clk_register_clkdev(clk, NULL, "uicc"); |
162 | 162 | ||
163 | /* | ||
164 | * FIXME: The MTU clocks might need some kind of "parent muxed join" | ||
165 | * and these have no K-clocks. For now, we ignore the missing | ||
166 | * connection to the corresponding P-clocks, p6_mtu0_clk and | ||
167 | * p6_mtu1_clk. Instead timclk is used which is the valid parent. | ||
168 | */ | ||
169 | clk = clk_reg_prcmu_gate("timclk", NULL, PRCMU_TIMCLK, CLK_IS_ROOT); | 163 | clk = clk_reg_prcmu_gate("timclk", NULL, PRCMU_TIMCLK, CLK_IS_ROOT); |
170 | clk_register_clkdev(clk, NULL, "mtu0"); | 164 | clk_register_clkdev(clk, NULL, "mtu0"); |
171 | clk_register_clkdev(clk, NULL, "mtu1"); | 165 | clk_register_clkdev(clk, NULL, "mtu1"); |
@@ -405,8 +399,11 @@ void u8500_clk_init(void) | |||
405 | 399 | ||
406 | clk = clk_reg_prcc_pclk("p6_pclk6", "per6clk", U8500_CLKRST6_BASE, | 400 | clk = clk_reg_prcc_pclk("p6_pclk6", "per6clk", U8500_CLKRST6_BASE, |
407 | BIT(6), 0); | 401 | BIT(6), 0); |
402 | clk_register_clkdev(clk, "apb_pclk", "mtu0"); | ||
403 | |||
408 | clk = clk_reg_prcc_pclk("p6_pclk7", "per6clk", U8500_CLKRST6_BASE, | 404 | clk = clk_reg_prcc_pclk("p6_pclk7", "per6clk", U8500_CLKRST6_BASE, |
409 | BIT(7), 0); | 405 | BIT(7), 0); |
406 | clk_register_clkdev(clk, "apb_pclk", "mtu1"); | ||
410 | 407 | ||
411 | /* PRCC K-clocks | 408 | /* PRCC K-clocks |
412 | * | 409 | * |