aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2011-12-31 16:37:04 +0100
committerLars-Dominik Braun <lars@6xq.net>2011-12-31 16:37:04 +0100
commitc5ec6dae72fcb0faba636110ff62298d423ef163 (patch)
tree6d1cc8fd80ad4f6b602a4719c57fa28dd9914c41
parent91e51701b30a09790b1420a3a5298221e6eb4384 (diff)
downloadbuildroot-n35-c5ec6dae72fcb0faba636110ff62298d423ef163.zip
buildroot-n35-c5ec6dae72fcb0faba636110ff62298d423ef163.tar.gz
buildroot-n35-c5ec6dae72fcb0faba636110ff62298d423ef163.tar.bz2
Update NAND patch
MTD_PARTITIONS has been removed? No sign of it…
-rw-r--r--linux/3.1.6/0008-n35-Support-for-NAND-Flash-on-Acer-n35.patch29
1 files changed, 5 insertions, 24 deletions
diff --git a/linux/3.1.6/0008-n35-Support-for-NAND-Flash-on-Acer-n35.patch b/linux/3.1.6/0008-n35-Support-for-NAND-Flash-on-Acer-n35.patch
index 3a72c6a..c579e6b 100644
--- a/linux/3.1.6/0008-n35-Support-for-NAND-Flash-on-Acer-n35.patch
+++ b/linux/3.1.6/0008-n35-Support-for-NAND-Flash-on-Acer-n35.patch
@@ -1,17 +1,5 @@
-From c8955e56555dae6e308b3fa3ea91c8d823402bd5 Mon Sep 17 00:00:00 2001
-From: Jiri Pinkava <jiri.pinkava@vscht.cz>
-Date: Sat, 22 May 2010 05:01:39 +0200
-Subject: [PATCH 08/14] n35: Support for NAND Flash on Acer n35
-
-Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz>
----
- arch/arm/mach-s3c2410/mach-n30.c | 73 ++++++++++++++++++++++++++++++++++++++
- 1 files changed, 73 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c
-index 3158165..c492f5d 100644
---- a/arch/arm/mach-s3c2410/mach-n30.c
-+++ b/arch/arm/mach-s3c2410/mach-n30.c
+--- linux-3.1.6/arch/arm/mach-s3c2410/mach-n30.c.orig 2011-12-31 16:29:50.173870254 +0100
++++ linux-3.1.6/arch/arm/mach-s3c2410/mach-n30.c 2011-12-31 16:35:23.089570614 +0100
@@ -17,6 +17,7 @@
#include <linux/kernel.h>
#include <linux/types.h>
@@ -20,7 +8,7 @@ index 3158165..c492f5d 100644
#include <linux/gpio_keys.h>
#include <linux/init.h>
#include <linux/gpio.h>
-@@ -49,10 +50,69 @@
+@@ -49,10 +50,67 @@
#include <plat/cpu.h>
#include <plat/devs.h>
#include <plat/mci.h>
@@ -29,7 +17,6 @@ index 3158165..c492f5d 100644
#include <plat/ts.h>
#include <plat/udc.h>
-+#ifdef CONFIG_MTD_PARTITIONS
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/nand_ecc.h>
@@ -85,22 +72,19 @@ index 3158165..c492f5d 100644
+ .sets = n35_nand_sets,
+ .ignore_unset_ecc = 1,
+};
-+#endif
+
static struct map_desc n30_iodesc[] __initdata = {
/* nothing here yet */
};
-@@ -492,6 +552,9 @@ static struct platform_device *n35_devices[] __initdata = {
+@@ -476,6 +534,7 @@
&s3c_device_rtc,
&s3c_device_usbgadget,
&s3c_device_sdi,
-+#ifdef CONFIG_MTD_PARTITIONS
+ &s3c_device_nand,
-+#endif
&s3c_device_adc,
&s3c_device_ts,
&s3c_device_timer[0],
-@@ -681,6 +744,16 @@ static void __init n30_init(void)
+@@ -665,6 +724,16 @@
}
if (machine_is_n35()) {
@@ -117,6 +101,3 @@ index 3158165..c492f5d 100644
/* Turn off suspend and switch the selectable USB port
* to USB device mode. Turn on suspend for the host
* port since it is not connected on the N35.
---
-1.7.3.1
-