From: zhaoyifeng <zyf@rock-chips.com>
Date: Fri, 23 Mar 2012 04:14:08 +0000 (+0800)
Subject: update nand driver
X-Git-Tag: firefly_0821_release~9595^2~32
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4b55eb5c99dd5c26ff381752e72426393c85aaec;p=firefly-linux-kernel-4.4.55.git

update nand driver
---

diff --git a/arch/arm/mach-rk30/devices.c b/arch/arm/mach-rk30/devices.c
old mode 100644
new mode 100755
index 12640d4c787e..01c89729a1e2
--- a/arch/arm/mach-rk30/devices.c
+++ b/arch/arm/mach-rk30/devices.c
@@ -726,7 +726,7 @@ static struct resource resources_nand[] = {
 };
 
 static struct platform_device device_nand = {
-	.name		= "rk30xxnand",
+	.name		= "rk29xxnand",
 	.id		= -1,
 	.resource	= resources_nand,
 	.num_resources	= ARRAY_SIZE(resources_nand),
diff --git a/drivers/mtd/rknand/Kconfig b/drivers/mtd/rknand/Kconfig
index 318c80c36763..5742f2087ce5 100755
--- a/drivers/mtd/rknand/Kconfig
+++ b/drivers/mtd/rknand/Kconfig
@@ -10,7 +10,7 @@ config MTD_RKNAND
 	  RK NAND Device Support 
 if MTD_RKNAND 
  
-config MTD_NAND_RK
+config MTD_NAND_RK29XX 
 	tristate "RK on-chip NAND Flash Controller driver with FTL" 
 	depends on MTD_RKNAND 
     default y 
@@ -29,13 +29,13 @@ config MTD_EMMC_CLK_POWER_SAVE
     default n
 	help 
  
-config MTD_NAND_RK_DEBUG 
+config MTD_NAND_RK29XX_DEBUG 
 	tristate "RK Nand driver debug enables"
 	depends on MTD_RKNAND 
     default n 
 	help 
 	 
-config MTD_NAND_RK_DEBUG_VERBOSE 
+config MTD_NAND_RK29XX_DEBUG_VERBOSE 
 	int "Debugging verbosity (0 = quiet, 3 = noisy)" 
 	depends on MTD_NAND_RK29XX_DEBUG 
 	default "0" 
diff --git a/drivers/mtd/rknand/Makefile b/drivers/mtd/rknand/Makefile
index 96be1a502ec4..bdda17ab8b26 100755
--- a/drivers/mtd/rknand/Makefile
+++ b/drivers/mtd/rknand/Makefile
@@ -3,7 +3,7 @@
 #
 # $Id: Makefile,v 1.3 2011/01/21 10:12:56 Administrator Exp $
 #
-obj-$(CONFIG_MTD_NAND_RK)		+= rknand_base_ko.o 
+obj-$(CONFIG_MTD_NAND_RK29XX)		+= rknand_base_ko.o 
 #obj-$(CONFIG_MTD_RKNAND_BUFFER)		+= rk30xxnand_ko.o
 
 
diff --git a/drivers/mtd/rknand/rknand_base_ko.c b/drivers/mtd/rknand/rknand_base_ko.c
index 0c0f2c7a5a22..0afad0d4fc8a 100755
--- a/drivers/mtd/rknand/rknand_base_ko.c
+++ b/drivers/mtd/rknand/rknand_base_ko.c
@@ -23,13 +23,7 @@
 //#include "api_flash.h"
 #include "rknand_base.h"
 
-#ifdef CONFIG_ARCH_RK30
-#define DRIVER_NAME	"rk30xxnand"
-#endif
-
-#ifdef CONFIG_ARCH_RK29
 #define DRIVER_NAME	"rk29xxnand"
-#endif
 
 const char rknand_base_version[] = "rknand_base.c version: 4.32 20120103";
 #define NAND_DEBUG_LEVEL0 0
@@ -43,8 +37,8 @@ struct mtd_info		rknand_mtd;
 struct mtd_partition *rknand_parts;
 struct rknand_info * gpNandInfo;
 
-#ifdef CONFIG_MTD_NAND_RK_DEBUG
-static int s_debug = CONFIG_MTD_NAND_RK_DEBUG_VERBOSE;
+#ifdef CONFIG_MTD_NAND_RK29XX_DEBUG
+static int s_debug = CONFIG_MTD_NAND_RK29XX_DEBUG_VERBOSE;
 #undef NAND_DEBUG
 #define NAND_DEBUG(n, format, arg...) \
 	if (n <= s_debug) {	 \