[adm5120] rename NAND driver

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8932 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/adm5120/files/drivers/mtd/nand/rbmipsnand.c b/target/linux/adm5120/files/drivers/mtd/nand/adm5120-nand.c
similarity index 100%
rename from target/linux/adm5120/files/drivers/mtd/nand/rbmipsnand.c
rename to target/linux/adm5120/files/drivers/mtd/nand/adm5120-nand.c

diff --git a/target/linux/adm5120/patches-2.6.22/004-adm5120_nand.patch b/target/linux/adm5120/patches-2.6.22/004-adm5120_nand.patch
index 79915e0281ccf79cca779bd0be10c6889d09e358..5441fef4159cb70718e7d6326381c9552e31dc50 100644 (file)
--- a/target/linux/adm5120/patches-2.6.22/004-adm5120_nand.patch
+++ b/target/linux/adm5120/patches-2.6.22/004-adm5120_nand.patch
@@ -2,15 +2,19 @@ Index: linux-2.6.22.1/drivers/mtd/nand/Kconfig
 ===================================================================
 --- linux-2.6.22.1.orig/drivers/mtd/nand/Kconfig
 +++ linux-2.6.22.1/drivers/mtd/nand/Kconfig
-@@ -81,6 +81,12 @@ config MTD_NAND_TS7250
+@@ -81,6 +81,16 @@ config MTD_NAND_TS7250
        help
          Support for NAND flash on Technologic Systems TS-7250 platform.
  
-+config MTD_NAND_RB100
-+      tristate "NAND Flash device on RB100 board"
-+      depends on MTD_NAND
++config MTD_NAND_ADM5120
++      tristate "ADM5120 NAND support"
++      depends on MTD_NAND && MIPS_ADM5120
 +      help
-+        Support for NAND flash on RB100 platform.
++        This enables the driver for the ADM5120 SoC built-in
++        NAND flash interface.
++
++        No board specific support is done by this driver, each board
++        must advertise a platform_device for the driver to attach.
 +
  config MTD_NAND_IDS
        tristate
@@ -23,7 +27,7 @@ Index: linux-2.6.22.1/drivers/mtd/nand/Makefile
  obj-$(CONFIG_MTD_NAND_SPIA)           += spia.o
  obj-$(CONFIG_MTD_NAND_AMS_DELTA)      += ams-delta.o
  obj-$(CONFIG_MTD_NAND_TOTO)           += toto.o
-+obj-$(CONFIG_MTD_NAND_RB100)          += rbmipsnand.o
++obj-$(CONFIG_MTD_NAND_ADM5120)                += adm5120-nand.o
  obj-$(CONFIG_MTD_NAND_AUTCPU12)               += autcpu12.o
  obj-$(CONFIG_MTD_NAND_EDB7312)                += edb7312.o
  obj-$(CONFIG_MTD_NAND_AU1550)         += au1550nd.o

diff --git a/target/linux/adm5120/router_le/config-2.6.22 b/target/linux/adm5120/router_le/config-2.6.22
index c07570c73324db19939c39322bd461be457f83b2..3a88bed9977f1eef48151a1a35124b1af006fd44 100644 (file)
--- a/target/linux/adm5120/router_le/config-2.6.22
+++ b/target/linux/adm5120/router_le/config-2.6.22
@@ -163,7 +163,7 @@ CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_NAND_RB100=y
+CONFIG_MTD_NAND_ADM5120=y
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_ONENAND is not set
 CONFIG_MTD_PARTITIONS=y