From 3c2087cad91500e25c0122b5a0576b7099e0960d Mon Sep 17 00:00:00 2001
From: wanzongshun <mcuos.com@gmail.com>
Date: Thu, 23 Jul 2009 08:47:57 +0100
Subject: [PATCH] --- yaml --- r: 160790 b: refs/heads/master c:
 768db4e04b4c969cf3a9e81a79a10af6468ca56d h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/mach-w90x900/mach-w90p910evb.c | 33 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 80bf9a056a70..7e020ab7626e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42ff4cf957b695250534e540375e23507c722327
+refs/heads/master: 768db4e04b4c969cf3a9e81a79a10af6468ca56d
diff --git a/trunk/arch/arm/mach-w90x900/mach-w90p910evb.c b/trunk/arch/arm/mach-w90x900/mach-w90p910evb.c
index 3b9fa312d9f5..2e56d84c6323 100644
--- a/trunk/arch/arm/mach-w90x900/mach-w90p910evb.c
+++ b/trunk/arch/arm/mach-w90x900/mach-w90p910evb.c
@@ -250,6 +250,38 @@ static struct platform_device w90p910_device_fmi = {
 	.resource	= w90p910_fmi_resource,
 };
 
+/* MAC device */
+
+static struct resource w90x900_emc_resource[] = {
+	[0] = {
+		.start = W90X900_PA_EMC,
+		.end   = W90X900_PA_EMC + W90X900_SZ_EMC - 1,
+		.flags = IORESOURCE_MEM,
+	},
+	[1] = {
+		.start = IRQ_EMCTX,
+		.end   = IRQ_EMCTX,
+		.flags = IORESOURCE_IRQ,
+	},
+	[2] = {
+		.start = IRQ_EMCRX,
+		.end   = IRQ_EMCRX,
+		.flags = IORESOURCE_IRQ,
+	}
+};
+
+static u64 w90x900_device_emc_dmamask = 0xffffffffUL;
+static struct platform_device w90p910_device_emc = {
+	.name		= "w90p910-emc",
+	.id		= -1,
+	.num_resources	= ARRAY_SIZE(w90x900_emc_resource),
+	.resource	= w90x900_emc_resource,
+	.dev              = {
+		.dma_mask = &w90x900_device_emc_dmamask,
+		.coherent_dma_mask = 0xffffffffUL
+	}
+};
+
 static struct map_desc w90p910_iodesc[] __initdata = {
 };
 
@@ -265,6 +297,7 @@ static struct platform_device *w90p910evb_dev[] __initdata = {
 	&w90x900_device_kpi,
 	&w90x900_device_usbgadget,
 	&w90p910_device_fmi,
+	&w90p910_device_emc,
 };
 
 static void __init w90p910evb_map_io(void)