Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63234717 authored by Alessandro Rubini's avatar Alessandro Rubini Committed by David Woodhouse
Browse files

mtd: nand: driver for Nomadik 8815 SoC (on NHK8815 board) 



Signed-off-by: default avatarAlessandro Rubini <rubini@unipv.it>
Acked-by: default avatarAndrea Gallo <andrea.gallo@stericsson.com>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 6469f540

arch/arm/configs/nhk8815_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ CONFIG_MTD_CFI_I2=y 
# CONFIG_MTD_DOC2001PLUS is not set

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_VERIFY_WRITE=y

# CONFIG_MTD_NAND_ECC_SMC is not set

CONFIG_MTD_NAND_ECC_SMC=y

# CONFIG_MTD_NAND_MUSEUM_IDS is not set

# CONFIG_MTD_NAND_GPIO is not set

CONFIG_MTD_NAND_IDS=y

arch/arm/mach-nomadik/board-nhk8815.c

+92 −0
Original line number Diff line number Diff line
@@ -16,12 +16,103 @@ 
#include <linux/amba/bus.h>

#include <linux/interrupt.h>

#include <linux/gpio.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/nand.h>

#include <linux/mtd/partitions.h>

#include <linux/io.h>

#include <asm/sizes.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/irq.h>

#include <mach/setup.h>

#include <mach/nand.h>

#include <mach/fsmc.h>

#include "clock.h"



/* These adresses span 16MB, so use three individual pages */

static struct resource nhk8815_nand_resources[] = {

	{

		.name = "nand_addr",

		.start = NAND_IO_ADDR,

		.end = NAND_IO_ADDR + 0xfff,

		.flags = IORESOURCE_MEM,

	}, {

		.name = "nand_cmd",

		.start = NAND_IO_CMD,

		.end = NAND_IO_CMD + 0xfff,

		.flags = IORESOURCE_MEM,

	}, {

		.name = "nand_data",

		.start = NAND_IO_DATA,

		.end = NAND_IO_DATA + 0xfff,

		.flags = IORESOURCE_MEM,

	}

};



static int nhk8815_nand_init(void)

{

	/* FSMC setup for nand chip select (8-bit nand in 8815NHK) */

	writel(0x0000000E, FSMC_PCR(0));

	writel(0x000D0A00, FSMC_PMEM(0));

	writel(0x00100A00, FSMC_PATT(0));



	/* enable access to the chip select area */

	writel(readl(FSMC_PCR(0)) | 0x04, FSMC_PCR(0));



	return 0;

}



/*

 * These partitions are the same as those used in the 2.6.20 release

 * shipped by the vendor; the first two partitions are mandated

 * by the boot ROM, and the bootloader area is somehow oversized...

 */

static struct mtd_partition nhk8815_partitions[] = {

	{

		.name	= "X-Loader(NAND)",

		.offset = 0,

		.size	= SZ_256K,

	}, {

		.name	= "MemInit(NAND)",

		.offset	= MTDPART_OFS_APPEND,

		.size	= SZ_256K,

	}, {

		.name	= "BootLoader(NAND)",

		.offset	= MTDPART_OFS_APPEND,

		.size	= SZ_2M,

	}, {

		.name	= "Kernel zImage(NAND)",

		.offset	= MTDPART_OFS_APPEND,

		.size	= 3 * SZ_1M,

	}, {

		.name	= "Root Filesystem(NAND)",

		.offset	= MTDPART_OFS_APPEND,

		.size	= 22 * SZ_1M,

	}, {

		.name	= "User Filesystem(NAND)",

		.offset	= MTDPART_OFS_APPEND,

		.size	= MTDPART_SIZ_FULL,

	}

};



static struct nomadik_nand_platform_data nhk8815_nand_data = {

	.parts		= nhk8815_partitions,

	.nparts		= ARRAY_SIZE(nhk8815_partitions),

	.options	= NAND_COPYBACK | NAND_CACHEPRG | NAND_NO_PADDING \

			| NAND_NO_READRDY | NAND_NO_AUTOINCR,

	.init		= nhk8815_nand_init,

};



static struct platform_device nhk8815_nand_device = {

	.name		= "nomadik_nand",

	.dev		= {

		.platform_data = &nhk8815_nand_data,

	},

	.resource	= nhk8815_nand_resources,

	.num_resources	= ARRAY_SIZE(nhk8815_nand_resources),

};





#define __MEM_4K_RESOURCE(x) \

	.res = {.start = (x), .end = (x) + SZ_4K - 1, .flags = IORESOURCE_MEM}
@@ -81,6 +172,7 @@ static int __init nhk8815_eth_init(void) 
device_initcall(nhk8815_eth_init);



static struct platform_device *nhk8815_platform_devices[] __initdata = {

	&nhk8815_nand_device,

	&nhk8815_eth_device,

	/* will add more devices */

};

arch/arm/mach-nomadik/include/mach/fsmc.h

0 → 100644
+29 −0
Original line number Diff line number Diff line 


/* Definitions for the Nomadik FSMC "Flexible Static Memory controller" */



#ifndef __ASM_ARCH_FSMC_H

#define __ASM_ARCH_FSMC_H



#include <mach/hardware.h>

/*

 * Register list

 */



/* bus control reg. and bus timing reg. for CS0..CS3 */

#define FSMC_BCR(x)     (NOMADIK_FSMC_VA + (x << 3))

#define FSMC_BTR(x)     (NOMADIK_FSMC_VA + (x << 3) + 0x04)



/* PC-card and NAND:

 * PCR = control register

 * PMEM = memory timing

 * PATT = attribute timing

 * PIO = I/O timing

 * PECCR = ECC result

 */

#define FSMC_PCR(x)     (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x00)

#define FSMC_PMEM(x)    (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x08)

#define FSMC_PATT(x)    (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x0c)

#define FSMC_PIO(x)     (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x10)

#define FSMC_PECCR(x)   (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x14)



#endif /* __ASM_ARCH_FSMC_H */

arch/arm/mach-nomadik/include/mach/nand.h

0 → 100644
+16 −0
Original line number Diff line number Diff line 
#ifndef __ASM_ARCH_NAND_H

#define __ASM_ARCH_NAND_H



struct nomadik_nand_platform_data {

	struct mtd_partition *parts;

	int nparts;

	int options;

	int (*init) (void);

	int (*exit) (void);

};



#define NAND_IO_DATA	0x40000000

#define NAND_IO_CMD	0x40800000

#define NAND_IO_ADDR	0x41000000



#endif				/* __ASM_ARCH_NAND_H */

drivers/mtd/nand/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -443,6 +443,12 @@ config MTD_NAND_MXC 
	  This enables the driver for the NAND flash controller on the

	  MXC processors.



config MTD_NAND_NOMADIK

	tristate "ST Nomadik 8815 NAND support"

	depends on ARCH_NOMADIK

	help

	  Driver for the NAND flash controller on the Nomadik, with ECC.



config MTD_NAND_SH_FLCTL

	tristate "Support for NAND on Renesas SuperH FLCTL"

	depends on MTD_NAND && SUPERH && CPU_SUBTYPE_SH7723