From ccde26564abc4c905f1ceeebe8a250245ae2956a Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 15 Jan 2010 12:11:30 +0900
Subject: [PATCH] --- yaml --- r: 181087 b: refs/heads/master c:
 2267c7875b3a3a41b7a8cc9659d75ec934c98ffd h: refs/heads/master i:   181085:
 348bc2e6a8e971263084ad81d0777a5db3fbff5b   181083:
 875a1c893f4e4e22e3ab0b49ca22b9a1f4a146a0   181079:
 587dca117cf0d38a717799e6227598e2cfd17f77   181071:
 bd2da7b6e13bd4f7e49b2e5f6e3b418230b22967   181055:
 bd97e6b4c0ae10f019e441fc84a7614d21cb780f v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/sh/boards/mach-sdk7786/setup.c | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fc7748f437b9..eb1cfc90bccf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10ab92d8c336c25af1fce46113ed85856e02e95d
+refs/heads/master: 2267c7875b3a3a41b7a8cc9659d75ec934c98ffd
diff --git a/trunk/arch/sh/boards/mach-sdk7786/setup.c b/trunk/arch/sh/boards/mach-sdk7786/setup.c
index b460dcc785c1..f2d4b75bf31c 100644
--- a/trunk/arch/sh/boards/mach-sdk7786/setup.c
+++ b/trunk/arch/sh/boards/mach-sdk7786/setup.c
@@ -15,8 +15,22 @@
 #include <linux/i2c.h>
 #include <linux/irq.h>
 #include <asm/machvec.h>
+#include <asm/heartbeat.h>
 #include <asm/sizes.h>
 
+static struct resource heartbeat_resource = {
+	.start		= 0x07fff8b0,
+	.end		= 0x07fff8b0 + sizeof(u16) - 1,
+	.flags		= IORESOURCE_MEM | IORESOURCE_MEM_16BIT,
+};
+
+static struct platform_device heartbeat_device = {
+	.name		= "heartbeat",
+	.id		= -1,
+	.num_resources	= 1,
+	.resource	= &heartbeat_resource,
+};
+
 static struct resource smsc911x_resources[] = {
 	[0] = {
 		.name		= "smsc911x-memory",
@@ -82,6 +96,7 @@ static struct i2c_board_info __initdata sdk7786_i2c_devices[] = {
 };
 
 static struct platform_device *sh7786_devices[] __initdata = {
+	&heartbeat_device,
 	&smsc911x_device,
 	&smbus_fpga_device,
 	&smbus_pcie_device,