sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Juergen Beisert 2012-01-02 12:43:52 +01:00 committed by Sascha Hauer
parent cbc08bfb42
commit b29b8f43d5
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boards/a9m2410/a9m2410.c
View File

@ -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 = {

2
arch/arm/boards/a9m2440/a9m2440.c
View File

@ -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"

2
arch/arm/boards/mini2440/mini2440.c
View File

@ -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>

2
arch/arm/mach-samsung/Kconfig
View File

@ -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.

0
arch/arm/mach-samsung/include/mach/s3c24x0-nand.h → arch/arm/mach-samsung/include/mach/s3c24xx-nand.h
View File

4
drivers/mtd/nand/Kconfig
View File

@ -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.

2
drivers/mtd/nand/Makefile
View File

@ -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

6
drivers/mtd/nand/nand_s3c2410.c → drivers/mtd/nand/nand_s3c24xx.c
View File

@ -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;