Merge branch 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

[linux-2.6-block.git] / arch / sh / boards / mach-se / 7724 / setup.c

diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index ccaa290e9aba1cb29222cde90819cecb2f246cc6..e74ae7b0d8bf35cecbcb0fbe985c8e60a9e8dffb 100644 (file)
--- 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 = {
 };
 
 static struct clk fsimcka_clk = {
-       .name           = "fsimcka_clk",
-       .id             = -1,
        .ops            = &fsimck_clk_ops,
        .enable_reg     = (void __iomem *)FCLKACR,
        .rate           = 0, /* unknown */
@@ -771,16 +769,20 @@ static int __init devices_setup(void)
 
        /* set SPU2 clock to 83.4 MHz */
        clk = clk_get(NULL, "spu_clk");
-       clk_set_rate(clk, clk_round_rate(clk, 83333333));
-       clk_put(clk);
+       if (clk) {
+               clk_set_rate(clk, clk_round_rate(clk, 83333333));
+               clk_put(clk);
+       }
 
        /* change parent of FSI A */
        clk = clk_get(NULL, "fsia_clk");
-       clk_register(&fsimcka_clk);
-       clk_set_parent(clk, &fsimcka_clk);
-       clk_set_rate(clk, 11000);
-       clk_set_rate(&fsimcka_clk, 11000);
-       clk_put(clk);
+       if (clk) {
+               clk_register(&fsimcka_clk);
+               clk_set_parent(clk, &fsimcka_clk);
+               clk_set_rate(clk, 11000);
+               clk_set_rate(&fsimcka_clk, 11000);
+               clk_put(clk);
+       }
 
        /* SDHI0 connected to cn7 */
        gpio_request(GPIO_FN_SDHI0CD, NULL);