diff options
Diffstat (limited to 'arch/sh/boards/mach-se/7724/setup.c')
-rw-r--r-- | arch/sh/boards/mach-se/7724/setup.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index ccaa290e9aba..e74ae7b0d8bf 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c | |||
@@ -276,8 +276,6 @@ static struct clk_ops fsimck_clk_ops = { | |||
276 | }; | 276 | }; |
277 | 277 | ||
278 | static struct clk fsimcka_clk = { | 278 | static struct clk fsimcka_clk = { |
279 | .name = "fsimcka_clk", | ||
280 | .id = -1, | ||
281 | .ops = &fsimck_clk_ops, | 279 | .ops = &fsimck_clk_ops, |
282 | .enable_reg = (void __iomem *)FCLKACR, | 280 | .enable_reg = (void __iomem *)FCLKACR, |
283 | .rate = 0, /* unknown */ | 281 | .rate = 0, /* unknown */ |
@@ -771,16 +769,20 @@ static int __init devices_setup(void) | |||
771 | 769 | ||
772 | /* set SPU2 clock to 83.4 MHz */ | 770 | /* set SPU2 clock to 83.4 MHz */ |
773 | clk = clk_get(NULL, "spu_clk"); | 771 | clk = clk_get(NULL, "spu_clk"); |
774 | clk_set_rate(clk, clk_round_rate(clk, 83333333)); | 772 | if (clk) { |
775 | clk_put(clk); | 773 | clk_set_rate(clk, clk_round_rate(clk, 83333333)); |
774 | clk_put(clk); | ||
775 | } | ||
776 | 776 | ||
777 | /* change parent of FSI A */ | 777 | /* change parent of FSI A */ |
778 | clk = clk_get(NULL, "fsia_clk"); | 778 | clk = clk_get(NULL, "fsia_clk"); |
779 | clk_register(&fsimcka_clk); | 779 | if (clk) { |
780 | clk_set_parent(clk, &fsimcka_clk); | 780 | clk_register(&fsimcka_clk); |
781 | clk_set_rate(clk, 11000); | 781 | clk_set_parent(clk, &fsimcka_clk); |
782 | clk_set_rate(&fsimcka_clk, 11000); | 782 | clk_set_rate(clk, 11000); |
783 | clk_put(clk); | 783 | clk_set_rate(&fsimcka_clk, 11000); |
784 | clk_put(clk); | ||
785 | } | ||
784 | 786 | ||
785 | /* SDHI0 connected to cn7 */ | 787 | /* SDHI0 connected to cn7 */ |
786 | gpio_request(GPIO_FN_SDHI0CD, NULL); | 788 | gpio_request(GPIO_FN_SDHI0CD, NULL); |