update nand driver

diff --git a/arch/arm/mach-rk30/devices.c b/arch/arm/mach-rk30/devices.c
old mode 100644 (file)
new mode 100755 (executable)
index 12640d4..01c8972
--- 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 318c80c36763efa9a1dcc1cd11406829884fdf25..5742f2087ce5eda2e78ae810e48819c07801885a 100755 (executable)
--- a/drivers/mtd/rknand/Kconfig
+++ b/drivers/mtd/rknand/Kconfig
@@ -10,7 +10,7 @@ config MTD_RKNAND
          RK NAND Device Support \r
 if MTD_RKNAND \r
  \r
-config MTD_NAND_RK\r
+config MTD_NAND_RK29XX \r
        tristate "RK on-chip NAND Flash Controller driver with FTL" \r
        depends on MTD_RKNAND \r
     default y \r
@@ -29,13 +29,13 @@ config MTD_EMMC_CLK_POWER_SAVE
     default n\r
        help \r
  \r
-config MTD_NAND_RK_DEBUG \r
+config MTD_NAND_RK29XX_DEBUG \r
        tristate "RK Nand driver debug enables"\r
        depends on MTD_RKNAND \r
     default n \r
        help \r
         \r
-config MTD_NAND_RK_DEBUG_VERBOSE \r
+config MTD_NAND_RK29XX_DEBUG_VERBOSE \r
        int "Debugging verbosity (0 = quiet, 3 = noisy)" \r
        depends on MTD_NAND_RK29XX_DEBUG \r
        default "0" \r

diff --git a/drivers/mtd/rknand/Makefile b/drivers/mtd/rknand/Makefile
index 96be1a502ec49f94c7878eaa01ac7f4c337029af..bdda17ab8b2677a5303eef6ec0c01d33e54b883d 100755 (executable)
--- a/drivers/mtd/rknand/Makefile
+++ b/drivers/mtd/rknand/Makefile
@@ -3,7 +3,7 @@
 #\r
 # $Id: Makefile,v 1.3 2011/01/21 10:12:56 Administrator Exp $\r
 #\r
-obj-$(CONFIG_MTD_NAND_RK)              += rknand_base_ko.o \r
+obj-$(CONFIG_MTD_NAND_RK29XX)          += rknand_base_ko.o \r
 #obj-$(CONFIG_MTD_RKNAND_BUFFER)               += rk30xxnand_ko.o\r
 \r
 \r

diff --git a/drivers/mtd/rknand/rknand_base_ko.c b/drivers/mtd/rknand/rknand_base_ko.c
index 0c0f2c7a5a22ec04e67d1bf9f4a2af17dcd63eaa..0afad0d4fc8ad4fc14d686df80a71b1ee8f337ae 100755 (executable)
--- a/drivers/mtd/rknand/rknand_base_ko.c
+++ b/drivers/mtd/rknand/rknand_base_ko.c
@@ -23,13 +23,7 @@
 //#include "api_flash.h"\r
 #include "rknand_base.h"\r
 \r
-#ifdef CONFIG_ARCH_RK30\r
-#define DRIVER_NAME    "rk30xxnand"\r
-#endif\r
-\r
-#ifdef CONFIG_ARCH_RK29\r
 #define DRIVER_NAME    "rk29xxnand"\r
-#endif\r
 \r
 const char rknand_base_version[] = "rknand_base.c version: 4.32 20120103";\r
 #define NAND_DEBUG_LEVEL0 0\r
@@ -43,8 +37,8 @@ struct mtd_info               rknand_mtd;
 struct mtd_partition *rknand_parts;\r
 struct rknand_info * gpNandInfo;\r
 \r
-#ifdef CONFIG_MTD_NAND_RK_DEBUG\r
-static int s_debug = CONFIG_MTD_NAND_RK_DEBUG_VERBOSE;\r
+#ifdef CONFIG_MTD_NAND_RK29XX_DEBUG\r
+static int s_debug = CONFIG_MTD_NAND_RK29XX_DEBUG_VERBOSE;\r
 #undef NAND_DEBUG\r
 #define NAND_DEBUG(n, format, arg...) \\r
        if (n <= s_debug) {      \\r