From 9dfe14cab55a36ccbc0a3a618eb2c84f72757787 Mon Sep 17 00:00:00 2001
From: Ramax Lo <ramaxlo@gmail.com>
Date: Mon, 7 Jul 2008 18:12:37 +0100
Subject: [PATCH] --- yaml --- r: 100851 b: refs/heads/master c:
 66493c2d88d5086399c5a485d6e41cb76b241a1f h: refs/heads/master i:   100849:
 2e15f4afecdb6b543682de7db263a3275b91aa1e   100847:
 ec1161d3241ec1e3f4bb8e43eec17ad5318cff47 v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/arm/mach-s3c2440/mach-at2440evb.c | 36 ++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ed155477c7d6..4d3434190c79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ab9897172b7ff3a1a37b65b53f71c5795a577b0
+refs/heads/master: 66493c2d88d5086399c5a485d6e41cb76b241a1f
diff --git a/trunk/arch/arm/mach-s3c2440/mach-at2440evb.c b/trunk/arch/arm/mach-s3c2440/mach-at2440evb.c
index 99f660564c11..f5e3c7f27639 100644
--- a/trunk/arch/arm/mach-s3c2440/mach-at2440evb.c
+++ b/trunk/arch/arm/mach-s3c2440/mach-at2440evb.c
@@ -20,6 +20,7 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/serial_core.h>
+#include <linux/dm9000.h>
 #include <linux/platform_device.h>
 
 #include <asm/mach/arch.h>
@@ -127,6 +128,40 @@ static struct s3c2410_platform_nand at2440evb_nand_info = {
 	.sets		= at2440evb_nand_sets,
 };
 
+/* DM9000AEP 10/100 ethernet controller */
+
+static struct resource at2440evb_dm9k_resource[] = {
+	[0] = {
+		.start = S3C2410_CS3,
+		.end   = S3C2410_CS3 + 3,
+		.flags = IORESOURCE_MEM
+	},
+	[1] = {
+		.start = S3C2410_CS3 + 4,
+		.end   = S3C2410_CS3 + 7,
+		.flags = IORESOURCE_MEM
+	},
+	[2] = {
+		.start = IRQ_EINT7,
+		.end   = IRQ_EINT7,
+		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
+	}
+};
+
+static struct dm9000_plat_data at2440evb_dm9k_pdata = {
+	.flags		= (DM9000_PLATF_16BITONLY | DM9000_PLATF_NO_EEPROM),
+};
+
+static struct platform_device at2440evb_device_eth = {
+	.name		= "dm9000",
+	.id		= -1,
+	.num_resources	= ARRAY_SIZE(at2440evb_dm9k_resource),
+	.resource	= at2440evb_dm9k_resource,
+	.dev		= {
+		.platform_data	= &at2440evb_dm9k_pdata,
+	},
+};
+
 static struct platform_device *at2440evb_devices[] __initdata = {
 	&s3c_device_usb,
 	&s3c_device_wdt,
@@ -134,6 +169,7 @@ static struct platform_device *at2440evb_devices[] __initdata = {
 	&s3c_device_i2c,
 	&s3c_device_rtc,
 	&s3c_device_nand,
+	&at2440evb_device_eth,
 };
 
 static void __init at2440evb_map_io(void)