Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (127 commits)
  sh: update defconfigs.
  sh: Fix up the NUMA build for recent LMB changes.
  sh64: provide a stub per_cpu_trap_init() definition.
  sh: fix up CONFIG_KEXEC=n build.
  sh: fixup the docbook paths for clock framework shuffling.
  driver core: Early dev_name() depends on slab_is_available().
  sh: simplify WARN usage in SH clock driver
  sh: Check return value of clk_get on ms7724
  sh: Check return value of clk_get on ecovec24
  sh: move sh clock-cpg.c contents to drivers/sh/clk-cpg.c
  sh: move sh clock.c contents to drivers/sh/clk.
  sh: move sh asm/clock.h contents to linux/sh_clk.h V2
  sh: remove unused clock lookup
  sh: switch boards to clkdev
  sh: switch sh4-202 to clkdev
  sh: switch shx3 to clkdev
  sh: switch sh7757 to clkdev
  sh: switch sh7763 to clkdev
  sh: switch sh7780 to clkdev
  sh: switch sh7786 to clkdev
  ...

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 = {
 };
 
 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);