From 28e2fabb166e4a2cdca3a3ddb1ee1572138cdf34 Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Date: Wed, 10 Jun 2009 05:04:32 +0000
Subject: [PATCH] --- yaml --- r: 146879 b: refs/heads/master c:
 f168dd00a9440a6f644db73bda47718fd12008e4 h: refs/heads/master i:   146877:
 e14fd7c965666b2818ad8216f7ed364a58f2fbdb   146875:
 bca1cab6d1f93a4fa3158113aec2595b5b2e43bc   146871:
 5f99cb78dc069f5afc8624ecbaa97a9ad0ba3b00   146863:
 da8211242d3d4b315dacf10d38ed3d0edfba3b99   146847:
 d51be146cd722b4193187ef1ab27a52d761a97b6   146815:
 fa0857f9688ed09e55eb22c19a29bfdb47d01452 v: v3

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

diff --git a/[refs] b/[refs]
index c6226f2b14e2..57404ee85d8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5eeff1f8ecbc4bc7c1dd8e97a8610bc4dd3def8
+refs/heads/master: f168dd00a9440a6f644db73bda47718fd12008e4
diff --git a/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7724.c b/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
index 585dd85c6c4e..e5ac9eb11c63 100644
--- a/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
+++ b/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
@@ -451,6 +451,35 @@ static struct platform_device tmu5_device = {
 	.num_resources	= ARRAY_SIZE(tmu5_resources),
 };
 
+/* JPU */
+static struct uio_info jpu_platform_data = {
+	.name = "JPU",
+	.version = "0",
+	.irq = 27,
+};
+
+static struct resource jpu_resources[] = {
+	[0] = {
+		.name	= "JPU",
+		.start	= 0xfe980000,
+		.end	= 0xfe9902d3,
+		.flags	= IORESOURCE_MEM,
+	},
+	[1] = {
+		/* place holder for contiguous memory */
+	},
+};
+
+static struct platform_device jpu_device = {
+	.name		= "uio_pdrv_genirq",
+	.id		= 3,
+	.dev = {
+		.platform_data	= &jpu_platform_data,
+	},
+	.resource	= jpu_resources,
+	.num_resources	= ARRAY_SIZE(jpu_resources),
+};
+
 static struct platform_device *sh7724_devices[] __initdata = {
 	&cmt_device,
 	&tmu0_device,
@@ -466,6 +495,7 @@ static struct platform_device *sh7724_devices[] __initdata = {
 	&vpu_device,
 	&veu0_device,
 	&veu1_device,
+	&jpu_device,
 };
 
 static int __init sh7724_devices_setup(void)
@@ -473,6 +503,7 @@ static int __init sh7724_devices_setup(void)
 	platform_resource_setup_memory(&vpu_device, "vpu", 2 << 20);
 	platform_resource_setup_memory(&veu0_device, "veu0", 2 << 20);
 	platform_resource_setup_memory(&veu1_device, "veu1", 2 << 20);
+	platform_resource_setup_memory(&jpu_device,  "jpu",  2 << 20);
 
 	return platform_add_devices(sh7724_devices,
 				    ARRAY_SIZE(sh7724_devices));