Merge branch 'gta02-machine-2.6.31' into om-gta02-2.6.31

1 files changed, 13 insertions, 0 deletions

diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
index 8b52a26f7c2..6aff6f02750 100644
--- a/arch/arm/mach-s3c2442/mach-gta02.c
+++ b/arch/arm/mach-s3c2442/mach-gta02.c
@@ -664,6 +664,7 @@ static struct s3c2410_platform_nand gta02_nand_info = {
 	.twrph1		= 15,
 	.nr_sets	= ARRAY_SIZE(gta02_nand_sets),
 	.sets		= gta02_nand_sets,
+	.software_ecc	= 1,
 };
 
 
@@ -1078,6 +1079,18 @@ static void gta02_hijack_gpb(void)
 	s3c24xx_gpios[1].chip.get = gta02_gpb_get;
 }
 
+/*
+ * Allow the bootloader to enable hw ecc
+ * hardware_ecc=1|0
+ */
+static int __init hardware_ecc_setup(char *str)
+{
+	if (str && str[0] == '1')
+		gta02_nand_info.software_ecc = 0;
+	return 1;
+}
+__setup("hardware_ecc=", hardware_ecc_setup);
+
 static void gta02_request_gpios(void)
 {
 	int ret;