From 2ef33398e6559dee767cd6066a55b3e1b1862c6a Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Wed, 18 Aug 2010 18:22:59 +0200
Subject: [PATCH] --- yaml --- r: 212494 b: refs/heads/master c:
 81aa17207b3c50f32be31a1be949e98c660da5f1 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/mach-mx3/Kconfig         | 1 +
 trunk/arch/arm/mach-mx3/mach-mx35_3ds.c | 8 ++++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2fd0f6c6ed8e..cb3deac0129e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d17e1c1ac3a1e4befecb34c20dc8cb901aa72aba
+refs/heads/master: 81aa17207b3c50f32be31a1be949e98c660da5f1
diff --git a/trunk/arch/arm/mach-mx3/Kconfig b/trunk/arch/arm/mach-mx3/Kconfig
index 85beece802aa..2ae10885635a 100644
--- a/trunk/arch/arm/mach-mx3/Kconfig
+++ b/trunk/arch/arm/mach-mx3/Kconfig
@@ -140,6 +140,7 @@ config MACH_MX35_3DS
 	bool "Support MX35PDK platform"
 	select ARCH_MX35
 	select IMX_HAVE_PLATFORM_IMX_UART
+	select IMX_HAVE_PLATFORM_MXC_NAND
 	default n
 	help
 	  Include support for MX35PDK platform. This includes specific
diff --git a/trunk/arch/arm/mach-mx3/mach-mx35_3ds.c b/trunk/arch/arm/mach-mx3/mach-mx35_3ds.c
index 73149b8fe92c..b3629e735606 100644
--- a/trunk/arch/arm/mach-mx3/mach-mx35_3ds.c
+++ b/trunk/arch/arm/mach-mx3/mach-mx35_3ds.c
@@ -66,6 +66,12 @@ static struct platform_device mx35pdk_flash = {
 	.num_resources = 1,
 };
 
+static const struct mxc_nand_platform_data mx35pdk_nand_board_info __initconst = {
+	.width = 1,
+	.hw_ecc = 1,
+	.flash_bbt = 1,
+};
+
 static struct platform_device *devices[] __initdata = {
 	&mxc_fec_device,
 	&mx35pdk_flash,
@@ -119,6 +125,8 @@ static void __init mxc_board_init(void)
 	imx35_add_imx_uart0(&uart_pdata);
 
 	mxc_register_device(&mxc_otg_udc_device, &usb_pdata);
+
+	imx35_add_mxc_nand(&mx35pdk_nand_board_info);
 }
 
 static void __init mx35pdk_timer_init(void)