diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2012-01-02 12:43:52 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-01-02 13:32:13 +0100 |
| commit | b29b8f43d56b62e406349a5cf1ed56f17454c1f7 (patch) | |
| tree | 7743f2d09f341da4305bebea36d687511f68cddd /drivers/mtd | |
| parent | cbc08bfb42f6c220d5539dc74ce99e9d6ee1ff06 (diff) | |
| download | barebox-b29b8f43d56b62e406349a5cf1ed56f17454c1f7.tar.gz barebox-b29b8f43d56b62e406349a5cf1ed56f17454c1f7.tar.xz | |
MACH SAMSUNG/S3C: Use the correct CPU family name to reflect NAND driver's usage
The aready existing NAND controller driver in Barebox is for the S3C24XX family
only. Change the name of the file to reflect this fact (and free the way to add
more recent Samsung NAND controllers)
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd')
| -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 |
3 files changed, 6 insertions, 6 deletions
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; |