diff options
author | Bhumika Goyal <bhumirks@gmail.com> | 2017-08-18 06:08:17 -0400 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-11-02 02:25:51 -0400 |
commit | 0777066dcee8a4f16db09fd21dfd58b6d83b12f9 (patch) | |
tree | 8a235c17eff34c93412808da5adaa11bcd751d02 | |
parent | fa1da981f5ee603610bd8f8920c4ec393e95ceeb (diff) |
clk: make clk_init_data const
Make these const as they are only stored in the init field of a clk_hw
structure, which is const.
Signed-off-by: Bhumika Goyal <bhumirks@gmail.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
-rw-r--r-- | drivers/clk/clk-twl6040.c | 2 | ||||
-rw-r--r-- | drivers/clk/clk-wm831x.c | 6 | ||||
-rw-r--r-- | drivers/clk/sirf/clk-atlas6.c | 2 | ||||
-rw-r--r-- | drivers/clk/sirf/clk-atlas7.c | 18 | ||||
-rw-r--r-- | drivers/clk/sirf/clk-common.c | 80 | ||||
-rw-r--r-- | drivers/clk/sirf/clk-prima2.c | 2 |
6 files changed, 55 insertions, 55 deletions
diff --git a/drivers/clk/clk-twl6040.c b/drivers/clk/clk-twl6040.c index 7b222a5db931..25dfe050ae9f 100644 --- a/drivers/clk/clk-twl6040.c +++ b/drivers/clk/clk-twl6040.c | |||
@@ -82,7 +82,7 @@ static const struct clk_ops twl6040_pdmclk_ops = { | |||
82 | .recalc_rate = twl6040_pdmclk_recalc_rate, | 82 | .recalc_rate = twl6040_pdmclk_recalc_rate, |
83 | }; | 83 | }; |
84 | 84 | ||
85 | static struct clk_init_data twl6040_pdmclk_init = { | 85 | static const struct clk_init_data twl6040_pdmclk_init = { |
86 | .name = "pdmclk", | 86 | .name = "pdmclk", |
87 | .ops = &twl6040_pdmclk_ops, | 87 | .ops = &twl6040_pdmclk_ops, |
88 | .flags = CLK_GET_RATE_NOCACHE, | 88 | .flags = CLK_GET_RATE_NOCACHE, |
diff --git a/drivers/clk/clk-wm831x.c b/drivers/clk/clk-wm831x.c index a47960aacfa5..146769532325 100644 --- a/drivers/clk/clk-wm831x.c +++ b/drivers/clk/clk-wm831x.c | |||
@@ -52,7 +52,7 @@ static const struct clk_ops wm831x_xtal_ops = { | |||
52 | .recalc_rate = wm831x_xtal_recalc_rate, | 52 | .recalc_rate = wm831x_xtal_recalc_rate, |
53 | }; | 53 | }; |
54 | 54 | ||
55 | static struct clk_init_data wm831x_xtal_init = { | 55 | static const struct clk_init_data wm831x_xtal_init = { |
56 | .name = "xtal", | 56 | .name = "xtal", |
57 | .ops = &wm831x_xtal_ops, | 57 | .ops = &wm831x_xtal_ops, |
58 | }; | 58 | }; |
@@ -225,7 +225,7 @@ static const struct clk_ops wm831x_fll_ops = { | |||
225 | .get_parent = wm831x_fll_get_parent, | 225 | .get_parent = wm831x_fll_get_parent, |
226 | }; | 226 | }; |
227 | 227 | ||
228 | static struct clk_init_data wm831x_fll_init = { | 228 | static const struct clk_init_data wm831x_fll_init = { |
229 | .name = "fll", | 229 | .name = "fll", |
230 | .ops = &wm831x_fll_ops, | 230 | .ops = &wm831x_fll_ops, |
231 | .parent_names = wm831x_fll_parents, | 231 | .parent_names = wm831x_fll_parents, |
@@ -338,7 +338,7 @@ static const struct clk_ops wm831x_clkout_ops = { | |||
338 | .set_parent = wm831x_clkout_set_parent, | 338 | .set_parent = wm831x_clkout_set_parent, |
339 | }; | 339 | }; |
340 | 340 | ||
341 | static struct clk_init_data wm831x_clkout_init = { | 341 | static const struct clk_init_data wm831x_clkout_init = { |
342 | .name = "clkout", | 342 | .name = "clkout", |
343 | .ops = &wm831x_clkout_ops, | 343 | .ops = &wm831x_clkout_ops, |
344 | .parent_names = wm831x_clkout_parents, | 344 | .parent_names = wm831x_clkout_parents, |
diff --git a/drivers/clk/sirf/clk-atlas6.c b/drivers/clk/sirf/clk-atlas6.c index 665fa681b2e1..0cd11e6893af 100644 --- a/drivers/clk/sirf/clk-atlas6.c +++ b/drivers/clk/sirf/clk-atlas6.c | |||
@@ -42,7 +42,7 @@ static struct clk_dmn clk_mmc45 = { | |||
42 | }, | 42 | }, |
43 | }; | 43 | }; |
44 | 44 | ||
45 | static struct clk_init_data clk_nand_init = { | 45 | static const struct clk_init_data clk_nand_init = { |
46 | .name = "nand", | 46 | .name = "nand", |
47 | .ops = &dmn_ops, | 47 | .ops = &dmn_ops, |
48 | .parent_names = dmn_clk_parents, | 48 | .parent_names = dmn_clk_parents, |
diff --git a/drivers/clk/sirf/clk-atlas7.c b/drivers/clk/sirf/clk-atlas7.c index d0c6c9a2d06a..be012b4bab46 100644 --- a/drivers/clk/sirf/clk-atlas7.c +++ b/drivers/clk/sirf/clk-atlas7.c | |||
@@ -392,7 +392,7 @@ static const char * const pll_clk_parents[] = { | |||
392 | "xin", | 392 | "xin", |
393 | }; | 393 | }; |
394 | 394 | ||
395 | static struct clk_init_data clk_cpupll_init = { | 395 | static const struct clk_init_data clk_cpupll_init = { |
396 | .name = "cpupll_vco", | 396 | .name = "cpupll_vco", |
397 | .ops = &ab_pll_ops, | 397 | .ops = &ab_pll_ops, |
398 | .parent_names = pll_clk_parents, | 398 | .parent_names = pll_clk_parents, |
@@ -406,7 +406,7 @@ static struct clk_pll clk_cpupll = { | |||
406 | }, | 406 | }, |
407 | }; | 407 | }; |
408 | 408 | ||
409 | static struct clk_init_data clk_mempll_init = { | 409 | static const struct clk_init_data clk_mempll_init = { |
410 | .name = "mempll_vco", | 410 | .name = "mempll_vco", |
411 | .ops = &ab_pll_ops, | 411 | .ops = &ab_pll_ops, |
412 | .parent_names = pll_clk_parents, | 412 | .parent_names = pll_clk_parents, |
@@ -420,7 +420,7 @@ static struct clk_pll clk_mempll = { | |||
420 | }, | 420 | }, |
421 | }; | 421 | }; |
422 | 422 | ||
423 | static struct clk_init_data clk_sys0pll_init = { | 423 | static const struct clk_init_data clk_sys0pll_init = { |
424 | .name = "sys0pll_vco", | 424 | .name = "sys0pll_vco", |
425 | .ops = &ab_pll_ops, | 425 | .ops = &ab_pll_ops, |
426 | .parent_names = pll_clk_parents, | 426 | .parent_names = pll_clk_parents, |
@@ -434,7 +434,7 @@ static struct clk_pll clk_sys0pll = { | |||
434 | }, | 434 | }, |
435 | }; | 435 | }; |
436 | 436 | ||
437 | static struct clk_init_data clk_sys1pll_init = { | 437 | static const struct clk_init_data clk_sys1pll_init = { |
438 | .name = "sys1pll_vco", | 438 | .name = "sys1pll_vco", |
439 | .ops = &ab_pll_ops, | 439 | .ops = &ab_pll_ops, |
440 | .parent_names = pll_clk_parents, | 440 | .parent_names = pll_clk_parents, |
@@ -448,7 +448,7 @@ static struct clk_pll clk_sys1pll = { | |||
448 | }, | 448 | }, |
449 | }; | 449 | }; |
450 | 450 | ||
451 | static struct clk_init_data clk_sys2pll_init = { | 451 | static const struct clk_init_data clk_sys2pll_init = { |
452 | .name = "sys2pll_vco", | 452 | .name = "sys2pll_vco", |
453 | .ops = &ab_pll_ops, | 453 | .ops = &ab_pll_ops, |
454 | .parent_names = pll_clk_parents, | 454 | .parent_names = pll_clk_parents, |
@@ -462,7 +462,7 @@ static struct clk_pll clk_sys2pll = { | |||
462 | }, | 462 | }, |
463 | }; | 463 | }; |
464 | 464 | ||
465 | static struct clk_init_data clk_sys3pll_init = { | 465 | static const struct clk_init_data clk_sys3pll_init = { |
466 | .name = "sys3pll_vco", | 466 | .name = "sys3pll_vco", |
467 | .ops = &ab_pll_ops, | 467 | .ops = &ab_pll_ops, |
468 | .parent_names = pll_clk_parents, | 468 | .parent_names = pll_clk_parents, |
@@ -596,7 +596,7 @@ static const char * const audiodto_clk_parents[] = { | |||
596 | "sys3pll_clk1", | 596 | "sys3pll_clk1", |
597 | }; | 597 | }; |
598 | 598 | ||
599 | static struct clk_init_data clk_audiodto_init = { | 599 | static const struct clk_init_data clk_audiodto_init = { |
600 | .name = "audio_dto", | 600 | .name = "audio_dto", |
601 | .ops = &dto_ops, | 601 | .ops = &dto_ops, |
602 | .parent_names = audiodto_clk_parents, | 602 | .parent_names = audiodto_clk_parents, |
@@ -617,7 +617,7 @@ static const char * const disp0dto_clk_parents[] = { | |||
617 | "sys3pll_clk1", | 617 | "sys3pll_clk1", |
618 | }; | 618 | }; |
619 | 619 | ||
620 | static struct clk_init_data clk_disp0dto_init = { | 620 | static const struct clk_init_data clk_disp0dto_init = { |
621 | .name = "disp0_dto", | 621 | .name = "disp0_dto", |
622 | .ops = &dto_ops, | 622 | .ops = &dto_ops, |
623 | .parent_names = disp0dto_clk_parents, | 623 | .parent_names = disp0dto_clk_parents, |
@@ -638,7 +638,7 @@ static const char * const disp1dto_clk_parents[] = { | |||
638 | "sys3pll_clk1", | 638 | "sys3pll_clk1", |
639 | }; | 639 | }; |
640 | 640 | ||
641 | static struct clk_init_data clk_disp1dto_init = { | 641 | static const struct clk_init_data clk_disp1dto_init = { |
642 | .name = "disp1_dto", | 642 | .name = "disp1_dto", |
643 | .ops = &dto_ops, | 643 | .ops = &dto_ops, |
644 | .parent_names = disp1dto_clk_parents, | 644 | .parent_names = disp1dto_clk_parents, |
diff --git a/drivers/clk/sirf/clk-common.c b/drivers/clk/sirf/clk-common.c index f9ef6fa84f0b..d8f9efa5129a 100644 --- a/drivers/clk/sirf/clk-common.c +++ b/drivers/clk/sirf/clk-common.c | |||
@@ -194,21 +194,21 @@ static const char * const pll_clk_parents[] = { | |||
194 | "osc", | 194 | "osc", |
195 | }; | 195 | }; |
196 | 196 | ||
197 | static struct clk_init_data clk_pll1_init = { | 197 | static const struct clk_init_data clk_pll1_init = { |
198 | .name = "pll1", | 198 | .name = "pll1", |
199 | .ops = &std_pll_ops, | 199 | .ops = &std_pll_ops, |
200 | .parent_names = pll_clk_parents, | 200 | .parent_names = pll_clk_parents, |
201 | .num_parents = ARRAY_SIZE(pll_clk_parents), | 201 | .num_parents = ARRAY_SIZE(pll_clk_parents), |
202 | }; | 202 | }; |
203 | 203 | ||
204 | static struct clk_init_data clk_pll2_init = { | 204 | static const struct clk_init_data clk_pll2_init = { |
205 | .name = "pll2", | 205 | .name = "pll2", |
206 | .ops = &std_pll_ops, | 206 | .ops = &std_pll_ops, |
207 | .parent_names = pll_clk_parents, | 207 | .parent_names = pll_clk_parents, |
208 | .num_parents = ARRAY_SIZE(pll_clk_parents), | 208 | .num_parents = ARRAY_SIZE(pll_clk_parents), |
209 | }; | 209 | }; |
210 | 210 | ||
211 | static struct clk_init_data clk_pll3_init = { | 211 | static const struct clk_init_data clk_pll3_init = { |
212 | .name = "pll3", | 212 | .name = "pll3", |
213 | .ops = &std_pll_ops, | 213 | .ops = &std_pll_ops, |
214 | .parent_names = pll_clk_parents, | 214 | .parent_names = pll_clk_parents, |
@@ -271,7 +271,7 @@ static const struct clk_ops usb_pll_ops = { | |||
271 | .recalc_rate = usb_pll_clk_recalc_rate, | 271 | .recalc_rate = usb_pll_clk_recalc_rate, |
272 | }; | 272 | }; |
273 | 273 | ||
274 | static struct clk_init_data clk_usb_pll_init = { | 274 | static const struct clk_init_data clk_usb_pll_init = { |
275 | .name = "usb_pll", | 275 | .name = "usb_pll", |
276 | .ops = &usb_pll_ops, | 276 | .ops = &usb_pll_ops, |
277 | .parent_names = pll_clk_parents, | 277 | .parent_names = pll_clk_parents, |
@@ -445,7 +445,7 @@ static const struct clk_ops msi_ops = { | |||
445 | .get_parent = dmn_clk_get_parent, | 445 | .get_parent = dmn_clk_get_parent, |
446 | }; | 446 | }; |
447 | 447 | ||
448 | static struct clk_init_data clk_mem_init = { | 448 | static const struct clk_init_data clk_mem_init = { |
449 | .name = "mem", | 449 | .name = "mem", |
450 | .ops = &msi_ops, | 450 | .ops = &msi_ops, |
451 | .parent_names = dmn_clk_parents, | 451 | .parent_names = dmn_clk_parents, |
@@ -459,7 +459,7 @@ static struct clk_dmn clk_mem = { | |||
459 | }, | 459 | }, |
460 | }; | 460 | }; |
461 | 461 | ||
462 | static struct clk_init_data clk_sys_init = { | 462 | static const struct clk_init_data clk_sys_init = { |
463 | .name = "sys", | 463 | .name = "sys", |
464 | .ops = &msi_ops, | 464 | .ops = &msi_ops, |
465 | .parent_names = dmn_clk_parents, | 465 | .parent_names = dmn_clk_parents, |
@@ -474,7 +474,7 @@ static struct clk_dmn clk_sys = { | |||
474 | }, | 474 | }, |
475 | }; | 475 | }; |
476 | 476 | ||
477 | static struct clk_init_data clk_io_init = { | 477 | static const struct clk_init_data clk_io_init = { |
478 | .name = "io", | 478 | .name = "io", |
479 | .ops = &msi_ops, | 479 | .ops = &msi_ops, |
480 | .parent_names = dmn_clk_parents, | 480 | .parent_names = dmn_clk_parents, |
@@ -496,7 +496,7 @@ static const struct clk_ops cpu_ops = { | |||
496 | .recalc_rate = cpu_clk_recalc_rate, | 496 | .recalc_rate = cpu_clk_recalc_rate, |
497 | }; | 497 | }; |
498 | 498 | ||
499 | static struct clk_init_data clk_cpu_init = { | 499 | static const struct clk_init_data clk_cpu_init = { |
500 | .name = "cpu", | 500 | .name = "cpu", |
501 | .ops = &cpu_ops, | 501 | .ops = &cpu_ops, |
502 | .parent_names = dmn_clk_parents, | 502 | .parent_names = dmn_clk_parents, |
@@ -524,7 +524,7 @@ static const struct clk_ops dmn_ops = { | |||
524 | 524 | ||
525 | /* dsp, gfx, mm, lcd and vpp domain */ | 525 | /* dsp, gfx, mm, lcd and vpp domain */ |
526 | 526 | ||
527 | static struct clk_init_data clk_dsp_init = { | 527 | static const struct clk_init_data clk_dsp_init = { |
528 | .name = "dsp", | 528 | .name = "dsp", |
529 | .ops = &dmn_ops, | 529 | .ops = &dmn_ops, |
530 | .parent_names = dmn_clk_parents, | 530 | .parent_names = dmn_clk_parents, |
@@ -539,7 +539,7 @@ static struct clk_dmn clk_dsp = { | |||
539 | }, | 539 | }, |
540 | }; | 540 | }; |
541 | 541 | ||
542 | static struct clk_init_data clk_gfx_init = { | 542 | static const struct clk_init_data clk_gfx_init = { |
543 | .name = "gfx", | 543 | .name = "gfx", |
544 | .ops = &dmn_ops, | 544 | .ops = &dmn_ops, |
545 | .parent_names = dmn_clk_parents, | 545 | .parent_names = dmn_clk_parents, |
@@ -554,7 +554,7 @@ static struct clk_dmn clk_gfx = { | |||
554 | }, | 554 | }, |
555 | }; | 555 | }; |
556 | 556 | ||
557 | static struct clk_init_data clk_mm_init = { | 557 | static const struct clk_init_data clk_mm_init = { |
558 | .name = "mm", | 558 | .name = "mm", |
559 | .ops = &dmn_ops, | 559 | .ops = &dmn_ops, |
560 | .parent_names = dmn_clk_parents, | 560 | .parent_names = dmn_clk_parents, |
@@ -574,7 +574,7 @@ static struct clk_dmn clk_mm = { | |||
574 | */ | 574 | */ |
575 | #define clk_gfx2d clk_mm | 575 | #define clk_gfx2d clk_mm |
576 | 576 | ||
577 | static struct clk_init_data clk_lcd_init = { | 577 | static const struct clk_init_data clk_lcd_init = { |
578 | .name = "lcd", | 578 | .name = "lcd", |
579 | .ops = &dmn_ops, | 579 | .ops = &dmn_ops, |
580 | .parent_names = dmn_clk_parents, | 580 | .parent_names = dmn_clk_parents, |
@@ -589,7 +589,7 @@ static struct clk_dmn clk_lcd = { | |||
589 | }, | 589 | }, |
590 | }; | 590 | }; |
591 | 591 | ||
592 | static struct clk_init_data clk_vpp_init = { | 592 | static const struct clk_init_data clk_vpp_init = { |
593 | .name = "vpp", | 593 | .name = "vpp", |
594 | .ops = &dmn_ops, | 594 | .ops = &dmn_ops, |
595 | .parent_names = dmn_clk_parents, | 595 | .parent_names = dmn_clk_parents, |
@@ -604,21 +604,21 @@ static struct clk_dmn clk_vpp = { | |||
604 | }, | 604 | }, |
605 | }; | 605 | }; |
606 | 606 | ||
607 | static struct clk_init_data clk_mmc01_init = { | 607 | static const struct clk_init_data clk_mmc01_init = { |
608 | .name = "mmc01", | 608 | .name = "mmc01", |
609 | .ops = &dmn_ops, | 609 | .ops = &dmn_ops, |
610 | .parent_names = dmn_clk_parents, | 610 | .parent_names = dmn_clk_parents, |
611 | .num_parents = ARRAY_SIZE(dmn_clk_parents), | 611 | .num_parents = ARRAY_SIZE(dmn_clk_parents), |
612 | }; | 612 | }; |
613 | 613 | ||
614 | static struct clk_init_data clk_mmc23_init = { | 614 | static const struct clk_init_data clk_mmc23_init = { |
615 | .name = "mmc23", | 615 | .name = "mmc23", |
616 | .ops = &dmn_ops, | 616 | .ops = &dmn_ops, |
617 | .parent_names = dmn_clk_parents, | 617 | .parent_names = dmn_clk_parents, |
618 | .num_parents = ARRAY_SIZE(dmn_clk_parents), | 618 | .num_parents = ARRAY_SIZE(dmn_clk_parents), |
619 | }; | 619 | }; |
620 | 620 | ||
621 | static struct clk_init_data clk_mmc45_init = { | 621 | static const struct clk_init_data clk_mmc45_init = { |
622 | .name = "mmc45", | 622 | .name = "mmc45", |
623 | .ops = &dmn_ops, | 623 | .ops = &dmn_ops, |
624 | .parent_names = dmn_clk_parents, | 624 | .parent_names = dmn_clk_parents, |
@@ -685,7 +685,7 @@ static const struct clk_ops ios_ops = { | |||
685 | .disable = std_clk_disable, | 685 | .disable = std_clk_disable, |
686 | }; | 686 | }; |
687 | 687 | ||
688 | static struct clk_init_data clk_cphif_init = { | 688 | static const struct clk_init_data clk_cphif_init = { |
689 | .name = "cphif", | 689 | .name = "cphif", |
690 | .ops = &ios_ops, | 690 | .ops = &ios_ops, |
691 | .parent_names = std_clk_io_parents, | 691 | .parent_names = std_clk_io_parents, |
@@ -699,7 +699,7 @@ static struct clk_std clk_cphif = { | |||
699 | }, | 699 | }, |
700 | }; | 700 | }; |
701 | 701 | ||
702 | static struct clk_init_data clk_dmac0_init = { | 702 | static const struct clk_init_data clk_dmac0_init = { |
703 | .name = "dmac0", | 703 | .name = "dmac0", |
704 | .ops = &ios_ops, | 704 | .ops = &ios_ops, |
705 | .parent_names = std_clk_io_parents, | 705 | .parent_names = std_clk_io_parents, |
@@ -713,7 +713,7 @@ static struct clk_std clk_dmac0 = { | |||
713 | }, | 713 | }, |
714 | }; | 714 | }; |
715 | 715 | ||
716 | static struct clk_init_data clk_dmac1_init = { | 716 | static const struct clk_init_data clk_dmac1_init = { |
717 | .name = "dmac1", | 717 | .name = "dmac1", |
718 | .ops = &ios_ops, | 718 | .ops = &ios_ops, |
719 | .parent_names = std_clk_io_parents, | 719 | .parent_names = std_clk_io_parents, |
@@ -727,7 +727,7 @@ static struct clk_std clk_dmac1 = { | |||
727 | }, | 727 | }, |
728 | }; | 728 | }; |
729 | 729 | ||
730 | static struct clk_init_data clk_audio_init = { | 730 | static const struct clk_init_data clk_audio_init = { |
731 | .name = "audio", | 731 | .name = "audio", |
732 | .ops = &ios_ops, | 732 | .ops = &ios_ops, |
733 | .parent_names = std_clk_io_parents, | 733 | .parent_names = std_clk_io_parents, |
@@ -741,7 +741,7 @@ static struct clk_std clk_audio = { | |||
741 | }, | 741 | }, |
742 | }; | 742 | }; |
743 | 743 | ||
744 | static struct clk_init_data clk_uart0_init = { | 744 | static const struct clk_init_data clk_uart0_init = { |
745 | .name = "uart0", | 745 | .name = "uart0", |
746 | .ops = &ios_ops, | 746 | .ops = &ios_ops, |
747 | .parent_names = std_clk_io_parents, | 747 | .parent_names = std_clk_io_parents, |
@@ -755,7 +755,7 @@ static struct clk_std clk_uart0 = { | |||
755 | }, | 755 | }, |
756 | }; | 756 | }; |
757 | 757 | ||
758 | static struct clk_init_data clk_uart1_init = { | 758 | static const struct clk_init_data clk_uart1_init = { |
759 | .name = "uart1", | 759 | .name = "uart1", |
760 | .ops = &ios_ops, | 760 | .ops = &ios_ops, |
761 | .parent_names = std_clk_io_parents, | 761 | .parent_names = std_clk_io_parents, |
@@ -769,7 +769,7 @@ static struct clk_std clk_uart1 = { | |||
769 | }, | 769 | }, |
770 | }; | 770 | }; |
771 | 771 | ||
772 | static struct clk_init_data clk_uart2_init = { | 772 | static const struct clk_init_data clk_uart2_init = { |
773 | .name = "uart2", | 773 | .name = "uart2", |
774 | .ops = &ios_ops, | 774 | .ops = &ios_ops, |
775 | .parent_names = std_clk_io_parents, | 775 | .parent_names = std_clk_io_parents, |
@@ -783,7 +783,7 @@ static struct clk_std clk_uart2 = { | |||
783 | }, | 783 | }, |
784 | }; | 784 | }; |
785 | 785 | ||
786 | static struct clk_init_data clk_usp0_init = { | 786 | static const struct clk_init_data clk_usp0_init = { |
787 | .name = "usp0", | 787 | .name = "usp0", |
788 | .ops = &ios_ops, | 788 | .ops = &ios_ops, |
789 | .parent_names = std_clk_io_parents, | 789 | .parent_names = std_clk_io_parents, |
@@ -797,7 +797,7 @@ static struct clk_std clk_usp0 = { | |||
797 | }, | 797 | }, |
798 | }; | 798 | }; |
799 | 799 | ||
800 | static struct clk_init_data clk_usp1_init = { | 800 | static const struct clk_init_data clk_usp1_init = { |
801 | .name = "usp1", | 801 | .name = "usp1", |
802 | .ops = &ios_ops, | 802 | .ops = &ios_ops, |
803 | .parent_names = std_clk_io_parents, | 803 | .parent_names = std_clk_io_parents, |
@@ -811,7 +811,7 @@ static struct clk_std clk_usp1 = { | |||
811 | }, | 811 | }, |
812 | }; | 812 | }; |
813 | 813 | ||
814 | static struct clk_init_data clk_usp2_init = { | 814 | static const struct clk_init_data clk_usp2_init = { |
815 | .name = "usp2", | 815 | .name = "usp2", |
816 | .ops = &ios_ops, | 816 | .ops = &ios_ops, |
817 | .parent_names = std_clk_io_parents, | 817 | .parent_names = std_clk_io_parents, |
@@ -825,7 +825,7 @@ static struct clk_std clk_usp2 = { | |||
825 | }, | 825 | }, |
826 | }; | 826 | }; |
827 | 827 | ||
828 | static struct clk_init_data clk_vip_init = { | 828 | static const struct clk_init_data clk_vip_init = { |
829 | .name = "vip", | 829 | .name = "vip", |
830 | .ops = &ios_ops, | 830 | .ops = &ios_ops, |
831 | .parent_names = std_clk_io_parents, | 831 | .parent_names = std_clk_io_parents, |
@@ -839,7 +839,7 @@ static struct clk_std clk_vip = { | |||
839 | }, | 839 | }, |
840 | }; | 840 | }; |
841 | 841 | ||
842 | static struct clk_init_data clk_spi0_init = { | 842 | static const struct clk_init_data clk_spi0_init = { |
843 | .name = "spi0", | 843 | .name = "spi0", |
844 | .ops = &ios_ops, | 844 | .ops = &ios_ops, |
845 | .parent_names = std_clk_io_parents, | 845 | .parent_names = std_clk_io_parents, |
@@ -853,7 +853,7 @@ static struct clk_std clk_spi0 = { | |||
853 | }, | 853 | }, |
854 | }; | 854 | }; |
855 | 855 | ||
856 | static struct clk_init_data clk_spi1_init = { | 856 | static const struct clk_init_data clk_spi1_init = { |
857 | .name = "spi1", | 857 | .name = "spi1", |
858 | .ops = &ios_ops, | 858 | .ops = &ios_ops, |
859 | .parent_names = std_clk_io_parents, | 859 | .parent_names = std_clk_io_parents, |
@@ -867,7 +867,7 @@ static struct clk_std clk_spi1 = { | |||
867 | }, | 867 | }, |
868 | }; | 868 | }; |
869 | 869 | ||
870 | static struct clk_init_data clk_tsc_init = { | 870 | static const struct clk_init_data clk_tsc_init = { |
871 | .name = "tsc", | 871 | .name = "tsc", |
872 | .ops = &ios_ops, | 872 | .ops = &ios_ops, |
873 | .parent_names = std_clk_io_parents, | 873 | .parent_names = std_clk_io_parents, |
@@ -881,7 +881,7 @@ static struct clk_std clk_tsc = { | |||
881 | }, | 881 | }, |
882 | }; | 882 | }; |
883 | 883 | ||
884 | static struct clk_init_data clk_i2c0_init = { | 884 | static const struct clk_init_data clk_i2c0_init = { |
885 | .name = "i2c0", | 885 | .name = "i2c0", |
886 | .ops = &ios_ops, | 886 | .ops = &ios_ops, |
887 | .parent_names = std_clk_io_parents, | 887 | .parent_names = std_clk_io_parents, |
@@ -895,7 +895,7 @@ static struct clk_std clk_i2c0 = { | |||
895 | }, | 895 | }, |
896 | }; | 896 | }; |
897 | 897 | ||
898 | static struct clk_init_data clk_i2c1_init = { | 898 | static const struct clk_init_data clk_i2c1_init = { |
899 | .name = "i2c1", | 899 | .name = "i2c1", |
900 | .ops = &ios_ops, | 900 | .ops = &ios_ops, |
901 | .parent_names = std_clk_io_parents, | 901 | .parent_names = std_clk_io_parents, |
@@ -909,7 +909,7 @@ static struct clk_std clk_i2c1 = { | |||
909 | }, | 909 | }, |
910 | }; | 910 | }; |
911 | 911 | ||
912 | static struct clk_init_data clk_pwmc_init = { | 912 | static const struct clk_init_data clk_pwmc_init = { |
913 | .name = "pwmc", | 913 | .name = "pwmc", |
914 | .ops = &ios_ops, | 914 | .ops = &ios_ops, |
915 | .parent_names = std_clk_io_parents, | 915 | .parent_names = std_clk_io_parents, |
@@ -923,7 +923,7 @@ static struct clk_std clk_pwmc = { | |||
923 | }, | 923 | }, |
924 | }; | 924 | }; |
925 | 925 | ||
926 | static struct clk_init_data clk_efuse_init = { | 926 | static const struct clk_init_data clk_efuse_init = { |
927 | .name = "efuse", | 927 | .name = "efuse", |
928 | .ops = &ios_ops, | 928 | .ops = &ios_ops, |
929 | .parent_names = std_clk_io_parents, | 929 | .parent_names = std_clk_io_parents, |
@@ -937,7 +937,7 @@ static struct clk_std clk_efuse = { | |||
937 | }, | 937 | }, |
938 | }; | 938 | }; |
939 | 939 | ||
940 | static struct clk_init_data clk_pulse_init = { | 940 | static const struct clk_init_data clk_pulse_init = { |
941 | .name = "pulse", | 941 | .name = "pulse", |
942 | .ops = &ios_ops, | 942 | .ops = &ios_ops, |
943 | .parent_names = std_clk_io_parents, | 943 | .parent_names = std_clk_io_parents, |
@@ -955,7 +955,7 @@ static const char * const std_clk_dsp_parents[] = { | |||
955 | "dsp", | 955 | "dsp", |
956 | }; | 956 | }; |
957 | 957 | ||
958 | static struct clk_init_data clk_gps_init = { | 958 | static const struct clk_init_data clk_gps_init = { |
959 | .name = "gps", | 959 | .name = "gps", |
960 | .ops = &ios_ops, | 960 | .ops = &ios_ops, |
961 | .parent_names = std_clk_dsp_parents, | 961 | .parent_names = std_clk_dsp_parents, |
@@ -969,7 +969,7 @@ static struct clk_std clk_gps = { | |||
969 | }, | 969 | }, |
970 | }; | 970 | }; |
971 | 971 | ||
972 | static struct clk_init_data clk_mf_init = { | 972 | static const struct clk_init_data clk_mf_init = { |
973 | .name = "mf", | 973 | .name = "mf", |
974 | .ops = &ios_ops, | 974 | .ops = &ios_ops, |
975 | .parent_names = std_clk_io_parents, | 975 | .parent_names = std_clk_io_parents, |
@@ -987,7 +987,7 @@ static const char * const std_clk_sys_parents[] = { | |||
987 | "sys", | 987 | "sys", |
988 | }; | 988 | }; |
989 | 989 | ||
990 | static struct clk_init_data clk_security_init = { | 990 | static const struct clk_init_data clk_security_init = { |
991 | .name = "security", | 991 | .name = "security", |
992 | .ops = &ios_ops, | 992 | .ops = &ios_ops, |
993 | .parent_names = std_clk_sys_parents, | 993 | .parent_names = std_clk_sys_parents, |
@@ -1005,7 +1005,7 @@ static const char * const std_clk_usb_parents[] = { | |||
1005 | "usb_pll", | 1005 | "usb_pll", |
1006 | }; | 1006 | }; |
1007 | 1007 | ||
1008 | static struct clk_init_data clk_usb0_init = { | 1008 | static const struct clk_init_data clk_usb0_init = { |
1009 | .name = "usb0", | 1009 | .name = "usb0", |
1010 | .ops = &ios_ops, | 1010 | .ops = &ios_ops, |
1011 | .parent_names = std_clk_usb_parents, | 1011 | .parent_names = std_clk_usb_parents, |
@@ -1019,7 +1019,7 @@ static struct clk_std clk_usb0 = { | |||
1019 | }, | 1019 | }, |
1020 | }; | 1020 | }; |
1021 | 1021 | ||
1022 | static struct clk_init_data clk_usb1_init = { | 1022 | static const struct clk_init_data clk_usb1_init = { |
1023 | .name = "usb1", | 1023 | .name = "usb1", |
1024 | .ops = &ios_ops, | 1024 | .ops = &ios_ops, |
1025 | .parent_names = std_clk_usb_parents, | 1025 | .parent_names = std_clk_usb_parents, |
diff --git a/drivers/clk/sirf/clk-prima2.c b/drivers/clk/sirf/clk-prima2.c index aac1c8ec151a..2f824320c318 100644 --- a/drivers/clk/sirf/clk-prima2.c +++ b/drivers/clk/sirf/clk-prima2.c | |||
@@ -42,7 +42,7 @@ static struct clk_dmn clk_mmc45 = { | |||
42 | }, | 42 | }, |
43 | }; | 43 | }; |
44 | 44 | ||
45 | static struct clk_init_data clk_nand_init = { | 45 | static const struct clk_init_data clk_nand_init = { |
46 | .name = "nand", | 46 | .name = "nand", |
47 | .ops = &ios_ops, | 47 | .ops = &ios_ops, |
48 | .parent_names = std_clk_io_parents, | 48 | .parent_names = std_clk_io_parents, |