Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 30 insertions, 16 deletions

diff --git a/arch/sh/boards/board-urquell.c b/arch/sh/boards/board-urquell.c
index 36b8bac9b124..a9bd6e3ee10b 100644
--- a/arch/sh/boards/board-urquell.c
+++ b/arch/sh/boards/board-urquell.c
@@ -2,7 +2,7 @@
  * Renesas Technology Corp. SH7786 Urquell Support.
  *
  * Copyright (C) 2008  Kuninori Morimoto <morimoto.kuninori@renesas.com>
- * Copyright (C) 2009  Paul Mundt
+ * Copyright (C) 2009, 2010  Paul Mundt
  *
  * Based on board-sh7785lcr.c
  * Copyright (C) 2008  Yoshihiro Shimoda
@@ -19,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/gpio.h>
 #include <linux/irq.h>
+#include <linux/clk.h>
 #include <mach/urquell.h>
 #include <cpu/sh7786.h>
 #include <asm/heartbeat.h>
@@ -50,26 +51,17 @@
  */
 
 /* HeartBeat */
-static struct resource heartbeat_resources[] = {
-        [0] = {
-                .start  = BOARDREG(SLEDR),
-                .end    = BOARDREG(SLEDR),
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct heartbeat_data heartbeat_data = {
-        .regsize = 16,
+static struct resource heartbeat_resource = {
+        .start  = BOARDREG(SLEDR),
+        .end    = BOARDREG(SLEDR),
+        .flags  = IORESOURCE_MEM | IORESOURCE_MEM_16BIT,
 };
 
 static struct platform_device heartbeat_device = {
         .name           = "heartbeat",
         .id             = -1,
-        .dev    = {
-                .platform_data  = &heartbeat_data,
-        },
-        .num_resources  = ARRAY_SIZE(heartbeat_resources),
-        .resource       = heartbeat_resources,
+        .num_resources  = 1,
+        .resource       = &heartbeat_resource,
 };
 
 /* LAN91C111 */
@@ -184,6 +176,27 @@ static int urquell_mode_pins(void)
         return __raw_readw(UBOARDREG(MDSWMR));
 }
 
+static int urquell_clk_init(void)
+{
+        struct clk *clk;
+        int ret;
+
+        /*
+         * Only handle the EXTAL case, anyone interfacing a crystal
+         * resonator will need to provide their own input clock.
+         */
+        if (test_mode_pin(MODE_PIN9))
+                return -EINVAL;
+
+        clk = clk_get(NULL, "extal");
+        if (!clk || IS_ERR(clk))
+                return PTR_ERR(clk);
+        ret = clk_set_rate(clk, 33333333);
+        clk_put(clk);
+
+        return ret;
+}
+
 /* Initialize the board */
 static void __init urquell_setup(char **cmdline_p)
 {
@@ -200,4 +213,5 @@ static struct sh_machine_vector mv_urquell __initmv = {
         .mv_setup       = urquell_setup,
         .mv_init_irq    = urquell_init_irq,
         .mv_mode_pins   = urquell_mode_pins,
+        .mv_clk_init    = urquell_clk_init,
 };