aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2012-10-22 09:57:59 -0400
committerMike Turquette <mturquette@linaro.org>2012-11-12 13:20:22 -0500
commit15e66cd8d029de8055822a98c5a72a4414ffc0a6 (patch)
tree28a8d716fe12de2446d9e5143289925f5c238027 /drivers
parent08b1f1c7b9bf0f6fe9e2ce3369928955554a958b (diff)
clk: ux500: Register msp clock lookups for u8500
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> 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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/clk/ux500/u8500_clk.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/clk/ux500/u8500_clk.c b/drivers/clk/ux500/u8500_clk.c
index 36ef41d90d67..be843ba1f49a 100644
--- a/drivers/clk/ux500/u8500_clk.c
+++ b/drivers/clk/ux500/u8500_clk.c
@@ -232,8 +232,13 @@ void u8500_clk_init(void)
232 232
233 clk = clk_reg_prcc_pclk("p1_pclk3", "per1clk", U8500_CLKRST1_BASE, 233 clk = clk_reg_prcc_pclk("p1_pclk3", "per1clk", U8500_CLKRST1_BASE,
234 BIT(3), 0); 234 BIT(3), 0);
235 clk_register_clkdev(clk, "apb_pclk", "msp0");
236 clk_register_clkdev(clk, "apb_pclk", "ux500-msp-i2s.0");
237
235 clk = clk_reg_prcc_pclk("p1_pclk4", "per1clk", U8500_CLKRST1_BASE, 238 clk = clk_reg_prcc_pclk("p1_pclk4", "per1clk", U8500_CLKRST1_BASE,
236 BIT(4), 0); 239 BIT(4), 0);
240 clk_register_clkdev(clk, "apb_pclk", "msp1");
241 clk_register_clkdev(clk, "apb_pclk", "ux500-msp-i2s.1");
237 242
238 clk = clk_reg_prcc_pclk("p1_pclk5", "per1clk", U8500_CLKRST1_BASE, 243 clk = clk_reg_prcc_pclk("p1_pclk5", "per1clk", U8500_CLKRST1_BASE,
239 BIT(5), 0); 244 BIT(5), 0);
@@ -262,6 +267,8 @@ void u8500_clk_init(void)
262 267
263 clk = clk_reg_prcc_pclk("p1_pclk11", "per1clk", U8500_CLKRST1_BASE, 268 clk = clk_reg_prcc_pclk("p1_pclk11", "per1clk", U8500_CLKRST1_BASE,
264 BIT(11), 0); 269 BIT(11), 0);
270 clk_register_clkdev(clk, "apb_pclk", "msp3");
271 clk_register_clkdev(clk, "apb_pclk", "ux500-msp-i2s.3");
265 272
266 clk = clk_reg_prcc_pclk("p2_pclk0", "per2clk", U8500_CLKRST2_BASE, 273 clk = clk_reg_prcc_pclk("p2_pclk0", "per2clk", U8500_CLKRST2_BASE,
267 BIT(0), 0); 274 BIT(0), 0);
@@ -285,6 +292,8 @@ void u8500_clk_init(void)
285 292
286 clk = clk_reg_prcc_pclk("p2_pclk5", "per2clk", U8500_CLKRST2_BASE, 293 clk = clk_reg_prcc_pclk("p2_pclk5", "per2clk", U8500_CLKRST2_BASE,
287 BIT(5), 0); 294 BIT(5), 0);
295 clk_register_clkdev(clk, "apb_pclk", "msp2");
296 clk_register_clkdev(clk, "apb_pclk", "ux500-msp-i2s.2");
288 297
289 clk = clk_reg_prcc_pclk("p2_pclk6", "per2clk", U8500_CLKRST2_BASE, 298 clk = clk_reg_prcc_pclk("p2_pclk6", "per2clk", U8500_CLKRST2_BASE,
290 BIT(6), 0); 299 BIT(6), 0);
@@ -415,8 +424,13 @@ void u8500_clk_init(void)
415 424
416 clk = clk_reg_prcc_kclk("p1_msp0_kclk", "msp02clk", 425 clk = clk_reg_prcc_kclk("p1_msp0_kclk", "msp02clk",
417 U8500_CLKRST1_BASE, BIT(3), CLK_SET_RATE_GATE); 426 U8500_CLKRST1_BASE, BIT(3), CLK_SET_RATE_GATE);
427 clk_register_clkdev(clk, NULL, "msp0");
428 clk_register_clkdev(clk, NULL, "ux500-msp-i2s.0");
429
418 clk = clk_reg_prcc_kclk("p1_msp1_kclk", "msp1clk", 430 clk = clk_reg_prcc_kclk("p1_msp1_kclk", "msp1clk",
419 U8500_CLKRST1_BASE, BIT(4), CLK_SET_RATE_GATE); 431 U8500_CLKRST1_BASE, BIT(4), CLK_SET_RATE_GATE);
432 clk_register_clkdev(clk, NULL, "msp1");
433 clk_register_clkdev(clk, NULL, "ux500-msp-i2s.1");
420 434
421 clk = clk_reg_prcc_kclk("p1_sdi0_kclk", "sdmmcclk", 435 clk = clk_reg_prcc_kclk("p1_sdi0_kclk", "sdmmcclk",
422 U8500_CLKRST1_BASE, BIT(5), CLK_SET_RATE_GATE); 436 U8500_CLKRST1_BASE, BIT(5), CLK_SET_RATE_GATE);
@@ -436,6 +450,8 @@ void u8500_clk_init(void)
436 450
437 clk = clk_reg_prcc_kclk("p1_msp3_kclk", "msp1clk", 451 clk = clk_reg_prcc_kclk("p1_msp3_kclk", "msp1clk",
438 U8500_CLKRST1_BASE, BIT(10), CLK_SET_RATE_GATE); 452 U8500_CLKRST1_BASE, BIT(10), CLK_SET_RATE_GATE);
453 clk_register_clkdev(clk, NULL, "msp3");
454 clk_register_clkdev(clk, NULL, "ux500-msp-i2s.3");
439 455
440 /* Periph2 */ 456 /* Periph2 */
441 clk = clk_reg_prcc_kclk("p2_i2c3_kclk", "i2cclk", 457 clk = clk_reg_prcc_kclk("p2_i2c3_kclk", "i2cclk",
@@ -448,6 +464,8 @@ void u8500_clk_init(void)
448 464
449 clk = clk_reg_prcc_kclk("p2_msp2_kclk", "msp02clk", 465 clk = clk_reg_prcc_kclk("p2_msp2_kclk", "msp02clk",
450 U8500_CLKRST2_BASE, BIT(3), CLK_SET_RATE_GATE); 466 U8500_CLKRST2_BASE, BIT(3), CLK_SET_RATE_GATE);
467 clk_register_clkdev(clk, NULL, "msp2");
468 clk_register_clkdev(clk, NULL, "ux500-msp-i2s.2");
451 469
452 clk = clk_reg_prcc_kclk("p2_sdi1_kclk", "sdmmcclk", 470 clk = clk_reg_prcc_kclk("p2_sdi1_kclk", "sdmmcclk",
453 U8500_CLKRST2_BASE, BIT(4), CLK_SET_RATE_GATE); 471 U8500_CLKRST2_BASE, BIT(4), CLK_SET_RATE_GATE);