diff options
| -rw-r--r-- | arch/arm/boards/a9m2410/a9m2410.c | 2 | ||||
| -rw-r--r-- | arch/arm/boards/a9m2440/a9m2440.c | 2 | ||||
| -rw-r--r-- | arch/arm/boards/mini2440/mini2440.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-samsung/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-samsung/include/mach/s3c24xx-nand.h (renamed from arch/arm/mach-samsung/include/mach/s3c24x0-nand.h) | 0 | ||||
| -rw-r--r-- | drivers/mtd/nand/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/mtd/nand/Makefile | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_s3c24xx.c (renamed from drivers/mtd/nand/nand_s3c2410.c) | 6 |
8 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/boards/a9m2410/a9m2410.c b/arch/arm/boards/a9m2410/a9m2410.c index 14eaa1bc8f..989dcf78ba 100644 --- a/arch/arm/boards/a9m2410/a9m2410.c +++ b/arch/arm/boards/a9m2410/a9m2410.c @@ -33,7 +33,7 @@ #include <nand.h> #include <io.h> #include <mach/s3c-iomap.h> -#include <mach/s3c24x0-nand.h> +#include <mach/s3c24xx-nand.h> // {"NAND 1MiB 3,3V 8-bit", 0xec, 256, 1, 0x1000, 0}, static struct s3c24x0_nand_platform_data nand_info = { diff --git a/arch/arm/boards/a9m2440/a9m2440.c b/arch/arm/boards/a9m2440/a9m2440.c index 90020529e2..1986efb620 100644 --- a/arch/arm/boards/a9m2440/a9m2440.c +++ b/arch/arm/boards/a9m2440/a9m2440.c @@ -33,7 +33,7 @@ #include <nand.h> #include <io.h> #include <mach/s3c-iomap.h> -#include <mach/s3c24x0-nand.h> +#include <mach/s3c24xx-nand.h> #include <mach/s3c-generic.h> #include "baseboards.h" diff --git a/arch/arm/boards/mini2440/mini2440.c b/arch/arm/boards/mini2440/mini2440.c index 5e6910bc2c..dca9083390 100644 --- a/arch/arm/boards/mini2440/mini2440.c +++ b/arch/arm/boards/mini2440/mini2440.c @@ -39,7 +39,7 @@ #include <io.h> #include <mach/gpio.h> #include <mach/s3c-iomap.h> -#include <mach/s3c24x0-nand.h> +#include <mach/s3c24xx-nand.h> #include <mach/s3c-generic.h> #include <mach/mci.h> #include <mach/fb.h> diff --git a/arch/arm/mach-samsung/Kconfig b/arch/arm/mach-samsung/Kconfig index a800cb89f3..bc283dc947 100644 --- a/arch/arm/mach-samsung/Kconfig +++ b/arch/arm/mach-samsung/Kconfig @@ -105,7 +105,7 @@ config S3C24XX_NAND_BOOT prompt "Booting from NAND" select MTD select NAND - select NAND_S3C24X0 + select NAND_S3C24XX help Add generic support to boot from NAND flash. Image loading will be skipped if the code is running from NOR or already from SDRAM. diff --git a/arch/arm/mach-samsung/include/mach/s3c24x0-nand.h b/arch/arm/mach-samsung/include/mach/s3c24xx-nand.h index 7610b4e29d..7610b4e29d 100644 --- a/arch/arm/mach-samsung/include/mach/s3c24x0-nand.h +++ b/arch/arm/mach-samsung/include/mach/s3c24xx-nand.h diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index bda0529293..926a64bf96 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -65,9 +65,9 @@ config NAND_ATMEL prompt "Atmel (AT91SAM9xxx) NAND driver" depends on ARCH_AT91 -config NAND_S3C24X0 +config NAND_S3C24XX bool - prompt "Samsung S3C24X0 NAND driver" + prompt "Samsung S3C24XX NAND driver" depends on ARCH_S3C24xx help Add support for processor's NAND device controller. diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile index 00b7b2731c..5c6d8b3cca 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -14,4 +14,4 @@ obj-$(CONFIG_MTD_NAND_NOMADIK) += nomadik_nand.o obj-$(CONFIG_NAND_IMX) += nand_imx.o obj-$(CONFIG_NAND_OMAP_GPMC) += nand_omap_gpmc.o nand_omap_bch_decoder.o obj-$(CONFIG_NAND_ATMEL) += atmel_nand.o -obj-$(CONFIG_NAND_S3C24X0) += nand_s3c2410.o +obj-$(CONFIG_NAND_S3C24XX) += nand_s3c24xx.o diff --git a/drivers/mtd/nand/nand_s3c2410.c b/drivers/mtd/nand/nand_s3c24xx.c index 3117614072..c4fd13ebfd 100644 --- a/drivers/mtd/nand/nand_s3c2410.c +++ b/drivers/mtd/nand/nand_s3c24xx.c @@ -32,7 +32,7 @@ #include <linux/mtd/nand.h> #include <mach/s3c-generic.h> #include <mach/s3c-iomap.h> -#include <mach/s3c24x0-nand.h> +#include <mach/s3c24xx-nand.h> #include <io.h> #include <asm-generic/errno.h> @@ -485,8 +485,8 @@ static int s3c24x0_nand_probe(struct device_d *dev) goto on_error; } - return add_mtd_device(mtd, "nand"); - + return add_mtd_device(mtd); + on_error: free(host); return ret; |