From e762b3e97d39780e5c9d4bc9f2f0dff909178bc0 Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Date: Wed, 15 Apr 2009 11:43:03 +0900
Subject: [PATCH] --- yaml --- r: 146617 b: refs/heads/master c:
 cd5b9ef776feff440e7a889d1a565ceabfecbfa1 h: refs/heads/master i:   146615:
 c77118633e41bc447c5cc1cf4e594a7f50f00c77 v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 33 ++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d3bf7cbf3ec7..8710a4e930ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40c7e8be556715079d0a9d7454ceb5371a2f0b39
+refs/heads/master: cd5b9ef776feff440e7a889d1a565ceabfecbfa1
diff --git a/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7724.c b/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
index f17eda6688d0..499a6fcdf231 100644
--- a/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
+++ b/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
@@ -143,16 +143,49 @@ static struct platform_device iic1_device = {
 	.resource       = iic1_resources,
 };
 
+/* VPU */
+static struct uio_info vpu_platform_data = {
+	.name = "VPU5F",
+	.version = "0",
+	.irq = 60,
+};
+
+static struct resource vpu_resources[] = {
+	[0] = {
+		.name	= "VPU",
+		.start	= 0xfe900000,
+		.end	= 0xfe902807,
+		.flags	= IORESOURCE_MEM,
+	},
+	[1] = {
+		/* place holder for contiguous memory */
+	},
+};
+
+static struct platform_device vpu_device = {
+	.name		= "uio_pdrv_genirq",
+	.id		= 0,
+	.dev = {
+		.platform_data	= &vpu_platform_data,
+	},
+	.resource	= vpu_resources,
+	.num_resources	= ARRAY_SIZE(vpu_resources),
+};
+
 static struct platform_device *sh7724_devices[] __initdata = {
 	&sci_device,
 	&rtc_device,
 	&iic0_device,
 	&iic1_device,
+	&vpu_device,
 };
 
 static int __init sh7724_devices_setup(void)
 {
 	clk_always_enable("rtc0");   /* RTC */
+	clk_always_enable("vpu0");   /* VPU */
+
+	platform_resource_setup_memory(&vpu_device, "vpu", 2 << 20);
 
 	return platform_add_devices(sh7724_devices,
 				    ARRAY_SIZE(sh7724_devices));