aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/clk/ux500/u8500_clk.c19
1 files changed, 18 insertions, 1 deletions
diff --git a/drivers/clk/ux500/u8500_clk.c b/drivers/clk/ux500/u8500_clk.c
index ca4a25ed844c..7ad01aa30efe 100644
--- a/drivers/clk/ux500/u8500_clk.c
+++ b/drivers/clk/ux500/u8500_clk.c
@@ -228,6 +228,8 @@ void u8500_clk_init(void)
228 228
229 clk = clk_reg_prcc_pclk("p1_pclk2", "per1clk", U8500_CLKRST1_BASE, 229 clk = clk_reg_prcc_pclk("p1_pclk2", "per1clk", U8500_CLKRST1_BASE,
230 BIT(2), 0); 230 BIT(2), 0);
231 clk_register_clkdev(clk, "apb_pclk", "nmk-i2c.1");
232
231 clk = clk_reg_prcc_pclk("p1_pclk3", "per1clk", U8500_CLKRST1_BASE, 233 clk = clk_reg_prcc_pclk("p1_pclk3", "per1clk", U8500_CLKRST1_BASE,
232 BIT(3), 0); 234 BIT(3), 0);
233 clk = clk_reg_prcc_pclk("p1_pclk4", "per1clk", U8500_CLKRST1_BASE, 235 clk = clk_reg_prcc_pclk("p1_pclk4", "per1clk", U8500_CLKRST1_BASE,
@@ -239,6 +241,7 @@ void u8500_clk_init(void)
239 241
240 clk = clk_reg_prcc_pclk("p1_pclk6", "per1clk", U8500_CLKRST1_BASE, 242 clk = clk_reg_prcc_pclk("p1_pclk6", "per1clk", U8500_CLKRST1_BASE,
241 BIT(6), 0); 243 BIT(6), 0);
244 clk_register_clkdev(clk, "apb_pclk", "nmk-i2c.2");
242 245
243 clk = clk_reg_prcc_pclk("p1_pclk7", "per1clk", U8500_CLKRST1_BASE, 246 clk = clk_reg_prcc_pclk("p1_pclk7", "per1clk", U8500_CLKRST1_BASE,
244 BIT(7), 0); 247 BIT(7), 0);
@@ -255,11 +258,14 @@ void u8500_clk_init(void)
255 258
256 clk = clk_reg_prcc_pclk("p1_pclk10", "per1clk", U8500_CLKRST1_BASE, 259 clk = clk_reg_prcc_pclk("p1_pclk10", "per1clk", U8500_CLKRST1_BASE,
257 BIT(10), 0); 260 BIT(10), 0);
261 clk_register_clkdev(clk, "apb_pclk", "nmk-i2c.4");
262
258 clk = clk_reg_prcc_pclk("p1_pclk11", "per1clk", U8500_CLKRST1_BASE, 263 clk = clk_reg_prcc_pclk("p1_pclk11", "per1clk", U8500_CLKRST1_BASE,
259 BIT(11), 0); 264 BIT(11), 0);
260 265
261 clk = clk_reg_prcc_pclk("p2_pclk0", "per2clk", U8500_CLKRST2_BASE, 266 clk = clk_reg_prcc_pclk("p2_pclk0", "per2clk", U8500_CLKRST2_BASE,
262 BIT(0), 0); 267 BIT(0), 0);
268 clk_register_clkdev(clk, "apb_pclk", "nmk-i2c.3");
263 269
264 clk = clk_reg_prcc_pclk("p2_pclk1", "per2clk", U8500_CLKRST2_BASE, 270 clk = clk_reg_prcc_pclk("p2_pclk1", "per2clk", U8500_CLKRST2_BASE,
265 BIT(1), 0); 271 BIT(1), 0);
@@ -284,7 +290,6 @@ void u8500_clk_init(void)
284 BIT(6), 0); 290 BIT(6), 0);
285 clk_register_clkdev(clk, "apb_pclk", "sdi1"); 291 clk_register_clkdev(clk, "apb_pclk", "sdi1");
286 292
287
288 clk = clk_reg_prcc_pclk("p2_pclk7", "per2clk", U8500_CLKRST2_BASE, 293 clk = clk_reg_prcc_pclk("p2_pclk7", "per2clk", U8500_CLKRST2_BASE,
289 BIT(7), 0); 294 BIT(7), 0);
290 clk_register_clkdev(clk, "apb_pclk", "sdi3"); 295 clk_register_clkdev(clk, "apb_pclk", "sdi3");
@@ -318,8 +323,10 @@ void u8500_clk_init(void)
318 BIT(1), 0); 323 BIT(1), 0);
319 clk = clk_reg_prcc_pclk("p3_pclk2", "per3clk", U8500_CLKRST3_BASE, 324 clk = clk_reg_prcc_pclk("p3_pclk2", "per3clk", U8500_CLKRST3_BASE,
320 BIT(2), 0); 325 BIT(2), 0);
326
321 clk = clk_reg_prcc_pclk("p3_pclk3", "per3clk", U8500_CLKRST3_BASE, 327 clk = clk_reg_prcc_pclk("p3_pclk3", "per3clk", U8500_CLKRST3_BASE,
322 BIT(3), 0); 328 BIT(3), 0);
329 clk_register_clkdev(clk, "apb_pclk", "nmk-i2c.0");
323 330
324 clk = clk_reg_prcc_pclk("p3_pclk4", "per3clk", U8500_CLKRST3_BASE, 331 clk = clk_reg_prcc_pclk("p3_pclk4", "per3clk", U8500_CLKRST3_BASE,
325 BIT(4), 0); 332 BIT(4), 0);
@@ -401,6 +408,8 @@ void u8500_clk_init(void)
401 408
402 clk = clk_reg_prcc_kclk("p1_i2c1_kclk", "i2cclk", 409 clk = clk_reg_prcc_kclk("p1_i2c1_kclk", "i2cclk",
403 U8500_CLKRST1_BASE, BIT(2), CLK_SET_RATE_GATE); 410 U8500_CLKRST1_BASE, BIT(2), CLK_SET_RATE_GATE);
411 clk_register_clkdev(clk, NULL, "nmk-i2c.1");
412
404 clk = clk_reg_prcc_kclk("p1_msp0_kclk", "msp02clk", 413 clk = clk_reg_prcc_kclk("p1_msp0_kclk", "msp02clk",
405 U8500_CLKRST1_BASE, BIT(3), CLK_SET_RATE_GATE); 414 U8500_CLKRST1_BASE, BIT(3), CLK_SET_RATE_GATE);
406 clk = clk_reg_prcc_kclk("p1_msp1_kclk", "msp1clk", 415 clk = clk_reg_prcc_kclk("p1_msp1_kclk", "msp1clk",
@@ -412,17 +421,23 @@ void u8500_clk_init(void)
412 421
413 clk = clk_reg_prcc_kclk("p1_i2c2_kclk", "i2cclk", 422 clk = clk_reg_prcc_kclk("p1_i2c2_kclk", "i2cclk",
414 U8500_CLKRST1_BASE, BIT(6), CLK_SET_RATE_GATE); 423 U8500_CLKRST1_BASE, BIT(6), CLK_SET_RATE_GATE);
424 clk_register_clkdev(clk, NULL, "nmk-i2c.2");
425
415 clk = clk_reg_prcc_kclk("p1_slimbus0_kclk", "slimclk", 426 clk = clk_reg_prcc_kclk("p1_slimbus0_kclk", "slimclk",
416 U8500_CLKRST1_BASE, BIT(3), CLK_SET_RATE_GATE); 427 U8500_CLKRST1_BASE, BIT(3), CLK_SET_RATE_GATE);
417 /* FIXME: Redefinition of BIT(3). */ 428 /* FIXME: Redefinition of BIT(3). */
429
418 clk = clk_reg_prcc_kclk("p1_i2c4_kclk", "i2cclk", 430 clk = clk_reg_prcc_kclk("p1_i2c4_kclk", "i2cclk",
419 U8500_CLKRST1_BASE, BIT(9), CLK_SET_RATE_GATE); 431 U8500_CLKRST1_BASE, BIT(9), CLK_SET_RATE_GATE);
432 clk_register_clkdev(clk, NULL, "nmk-i2c.4");
433
420 clk = clk_reg_prcc_kclk("p1_msp3_kclk", "msp1clk", 434 clk = clk_reg_prcc_kclk("p1_msp3_kclk", "msp1clk",
421 U8500_CLKRST1_BASE, BIT(10), CLK_SET_RATE_GATE); 435 U8500_CLKRST1_BASE, BIT(10), CLK_SET_RATE_GATE);
422 436
423 /* Periph2 */ 437 /* Periph2 */
424 clk = clk_reg_prcc_kclk("p2_i2c3_kclk", "i2cclk", 438 clk = clk_reg_prcc_kclk("p2_i2c3_kclk", "i2cclk",
425 U8500_CLKRST2_BASE, BIT(0), CLK_SET_RATE_GATE); 439 U8500_CLKRST2_BASE, BIT(0), CLK_SET_RATE_GATE);
440 clk_register_clkdev(clk, NULL, "nmk-i2c.3");
426 441
427 clk = clk_reg_prcc_kclk("p2_sdi4_kclk", "sdmmcclk", 442 clk = clk_reg_prcc_kclk("p2_sdi4_kclk", "sdmmcclk",
428 U8500_CLKRST2_BASE, BIT(2), CLK_SET_RATE_GATE); 443 U8500_CLKRST2_BASE, BIT(2), CLK_SET_RATE_GATE);
@@ -452,8 +467,10 @@ void u8500_clk_init(void)
452 U8500_CLKRST3_BASE, BIT(1), CLK_SET_RATE_GATE); 467 U8500_CLKRST3_BASE, BIT(1), CLK_SET_RATE_GATE);
453 clk = clk_reg_prcc_kclk("p3_ssp1_kclk", "sspclk", 468 clk = clk_reg_prcc_kclk("p3_ssp1_kclk", "sspclk",
454 U8500_CLKRST3_BASE, BIT(2), CLK_SET_RATE_GATE); 469 U8500_CLKRST3_BASE, BIT(2), CLK_SET_RATE_GATE);
470
455 clk = clk_reg_prcc_kclk("p3_i2c0_kclk", "i2cclk", 471 clk = clk_reg_prcc_kclk("p3_i2c0_kclk", "i2cclk",
456 U8500_CLKRST3_BASE, BIT(3), CLK_SET_RATE_GATE); 472 U8500_CLKRST3_BASE, BIT(3), CLK_SET_RATE_GATE);
473 clk_register_clkdev(clk, NULL, "nmk-i2c.0");
457 474
458 clk = clk_reg_prcc_kclk("p3_sdi2_kclk", "sdmmcclk", 475 clk = clk_reg_prcc_kclk("p3_sdi2_kclk", "sdmmcclk",
459 U8500_CLKRST3_BASE, BIT(4), CLK_SET_RATE_GATE); 476 U8500_CLKRST3_BASE, BIT(4), CLK_SET_RATE_GATE);