Commit 7c51d57e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/mtd-2.6 

* git://git.infradead.org/mtd-2.6: (67 commits)
  [MTD] [MAPS] Fix printk format warning in nettel.c
  [MTD] [NAND] add cmdline parsing (mtdparts=) support to cafe_nand
  [MTD] CFI: remove major/minor version check for command set 0x0002
  [MTD] [NAND] ndfc driver
  [MTD] [TESTS] Fix some size_t printk format warnings
  [MTD] LPDDR Makefile and KConfig
  [MTD] LPDDR extended physmap driver to support LPDDR flash
  [MTD] LPDDR added new pfow_base parameter
  [MTD] LPDDR Command set driver
  [MTD] LPDDR PFOW definition
  [MTD] LPDDR QINFO records definitions
  [MTD] LPDDR qinfo probing.
  [MTD] [NAND] pxa3xx: convert from ns to clock ticks more accurately
  [MTD] [NAND] pxa3xx: fix non-page-aligned reads
  [MTD] [NAND] fix nandsim sched.h references
  [MTD] [NAND] alauda: use USB API functions rather than constants
  [MTD] struct device - replace bus_id with dev_name(), dev_set_name()
  [MTD] fix m25p80 64-bit divisions
  [MTD] fix dataflash 64-bit divisions
  [MTD] [NAND] Set the fsl elbc ECCM according the settings in bootloader.
  ...

Fixed up trivial debug conflicts in drivers/mtd/devices/{m25p80.c,mtd_dataflash.c}
parents a3a798c8 85795dac

Documentation/powerpc/dts-bindings/4xx/ndfc.txt

0 → 100644
+39 −0
Original line number Diff line number Diff line 
AMCC NDFC (NanD Flash Controller)



Required properties:

- compatible : "ibm,ndfc".

- reg : should specify chip select and size used for the chip (0x2000).



Optional properties:

- ccr : NDFC config and control register value (default 0).

- bank-settings : NDFC bank configuration register value (default 0).



Notes:

- partition(s) - follows the OF MTD standard for partitions



Example:



ndfc@1,0 {

	compatible = "ibm,ndfc";

	reg = <0x00000001 0x00000000 0x00002000>;

	ccr = <0x00001000>;

	bank-settings = <0x80002222>;

	#address-cells = <1>;

	#size-cells = <1>;



	nand {

		#address-cells = <1>;

		#size-cells = <1>;



		partition@0 {

			label = "kernel";

			reg = <0x00000000 0x00200000>;

		};

		partition@200000 {

			label = "root";

			reg = <0x00200000 0x03E00000>;

		};

	};

};

arch/arm/mach-pxa/corgi.c

+54 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/ads7846.h>

#include <linux/spi/corgi_lcd.h>

#include <linux/mtd/sharpsl.h>

#include <video/w100fb.h>



#include <asm/setup.h>
@@ -542,6 +543,55 @@ err_free_1: 
static inline void corgi_init_spi(void) {}

#endif



static struct mtd_partition sharpsl_nand_partitions[] = {

	{

		.name = "System Area",

		.offset = 0,

		.size = 7 * 1024 * 1024,

	},

	{

		.name = "Root Filesystem",

		.offset = 7 * 1024 * 1024,

		.size = 25 * 1024 * 1024,

	},

	{

		.name = "Home Filesystem",

		.offset = MTDPART_OFS_APPEND,

		.size = MTDPART_SIZ_FULL,

	},

};



static uint8_t scan_ff_pattern[] = { 0xff, 0xff };



static struct nand_bbt_descr sharpsl_bbt = {

	.options = 0,

	.offs = 4,

	.len = 2,

	.pattern = scan_ff_pattern

};



static struct sharpsl_nand_platform_data sharpsl_nand_platform_data = {

	.badblock_pattern	= &sharpsl_bbt,

	.partitions		= sharpsl_nand_partitions,

	.nr_partitions		= ARRAY_SIZE(sharpsl_nand_partitions),

};



static struct resource sharpsl_nand_resources[] = {

	{

		.start	= 0x0C000000,

		.end	= 0x0C000FFF,

		.flags	= IORESOURCE_MEM,

	},

};



static struct platform_device sharpsl_nand_device = {

	.name		= "sharpsl-nand",

	.id		= -1,

	.resource	= sharpsl_nand_resources,

	.num_resources	= ARRAY_SIZE(sharpsl_nand_resources),

	.dev.platform_data	= &sharpsl_nand_platform_data,

};



static struct mtd_partition sharpsl_rom_parts[] = {

	{

		.name	="Boot PROM Filesystem",
@@ -577,6 +627,7 @@ static struct platform_device *devices[] __initdata = { 
	&corgifb_device,

	&corgikbd_device,

	&corgiled_device,

	&sharpsl_nand_device,

	&sharpsl_rom_device,

};
@@ -617,6 +668,9 @@ static void __init corgi_init(void) 


	platform_scoop_config = &corgi_pcmcia_config;



	if (machine_is_husky())

		sharpsl_nand_partitions[1].size = 53 * 1024 * 1024;



	platform_add_devices(devices, ARRAY_SIZE(devices));

}

arch/arm/mach-pxa/poodle.c

+51 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/gpio.h>

#include <linux/spi/spi.h>

#include <linux/spi/ads7846.h>

#include <linux/mtd/sharpsl.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>
@@ -414,6 +415,55 @@ static struct pxafb_mach_info poodle_fb_info = { 
	.lcd_conn	= LCD_COLOR_TFT_16BPP,

};



static struct mtd_partition sharpsl_nand_partitions[] = {

	{

		.name = "System Area",

		.offset = 0,

		.size = 7 * 1024 * 1024,

	},

	{

		.name = "Root Filesystem",

		.offset = 7 * 1024 * 1024,

		.size = 22 * 1024 * 1024,

	},

	{

		.name = "Home Filesystem",

		.offset = MTDPART_OFS_APPEND,

		.size = MTDPART_SIZ_FULL,

	},

};



static uint8_t scan_ff_pattern[] = { 0xff, 0xff };



static struct nand_bbt_descr sharpsl_bbt = {

	.options = 0,

	.offs = 4,

	.len = 2,

	.pattern = scan_ff_pattern

};



static struct sharpsl_nand_platform_data sharpsl_nand_platform_data = {

	.badblock_pattern	= &sharpsl_bbt,

	.partitions		= sharpsl_nand_partitions,

	.nr_partitions		= ARRAY_SIZE(sharpsl_nand_partitions),

};



static struct resource sharpsl_nand_resources[] = {

	{

		.start	= 0x0C000000,

		.end	= 0x0C000FFF,

		.flags	= IORESOURCE_MEM,

	},

};



static struct platform_device sharpsl_nand_device = {

	.name		= "sharpsl-nand",

	.id		= -1,

	.resource	= sharpsl_nand_resources,

	.num_resources	= ARRAY_SIZE(sharpsl_nand_resources),

	.dev.platform_data	= &sharpsl_nand_platform_data,

};



static struct mtd_partition sharpsl_rom_parts[] = {

	{

		.name	="Boot PROM Filesystem",
@@ -447,6 +497,7 @@ static struct platform_device sharpsl_rom_device = { 
static struct platform_device *devices[] __initdata = {

	&poodle_locomo_device,

	&poodle_scoop_device,

	&sharpsl_nand_device,

	&sharpsl_rom_device,

};

arch/arm/mach-pxa/spitz.c

+77 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/ads7846.h>

#include <linux/spi/corgi_lcd.h>

#include <linux/mtd/sharpsl.h>



#include <asm/setup.h>

#include <asm/memory.h>
@@ -613,6 +614,54 @@ static struct pxafb_mach_info spitz_pxafb_info = { 
	.lcd_conn	= LCD_COLOR_TFT_16BPP | LCD_ALTERNATE_MAPPING,

};



static struct mtd_partition sharpsl_nand_partitions[] = {

	{

		.name = "System Area",

		.offset = 0,

		.size = 7 * 1024 * 1024,

	},

	{

		.name = "Root Filesystem",

		.offset = 7 * 1024 * 1024,

	},

	{

		.name = "Home Filesystem",

		.offset = MTDPART_OFS_APPEND,

		.size = MTDPART_SIZ_FULL,

	},

};



static uint8_t scan_ff_pattern[] = { 0xff, 0xff };



static struct nand_bbt_descr sharpsl_bbt = {

	.options = 0,

	.offs = 4,

	.len = 2,

	.pattern = scan_ff_pattern

};



static struct sharpsl_nand_platform_data sharpsl_nand_platform_data = {

	.badblock_pattern	= &sharpsl_bbt,

	.partitions		= sharpsl_nand_partitions,

	.nr_partitions		= ARRAY_SIZE(sharpsl_nand_partitions),

};



static struct resource sharpsl_nand_resources[] = {

	{

		.start	= 0x0C000000,

		.end	= 0x0C000FFF,

		.flags	= IORESOURCE_MEM,

	},

};



static struct platform_device sharpsl_nand_device = {

	.name		= "sharpsl-nand",

	.id		= -1,

	.resource	= sharpsl_nand_resources,

	.num_resources	= ARRAY_SIZE(sharpsl_nand_resources),

	.dev.platform_data	= &sharpsl_nand_platform_data,

};





static struct mtd_partition sharpsl_rom_parts[] = {

	{
@@ -648,6 +697,7 @@ static struct platform_device *devices[] __initdata = { 
	&spitzscoop_device,

	&spitzkbd_device,

	&spitzled_device,

	&sharpsl_nand_device,

	&sharpsl_rom_device,

};
@@ -671,6 +721,14 @@ static void __init common_init(void) 
	pm_power_off = spitz_poweroff;

	arm_pm_restart = spitz_restart;



	if (machine_is_spitz()) {

		sharpsl_nand_partitions[1].size = 5 * 1024 * 1024;

	} else if (machine_is_akita()) {

		sharpsl_nand_partitions[1].size = 58 * 1024 * 1024;

	} else if (machine_is_borzoi()) {

		sharpsl_nand_partitions[1].size = 32 * 1024 * 1024;

	}



	PMCR = 0x00;



	/* Stop 3.6MHz and drive HIGH to PCMCIA and CS */
@@ -715,10 +773,29 @@ static struct i2c_board_info akita_i2c_board_info[] = { 
	},

};



static struct nand_bbt_descr sharpsl_akita_bbt = {

	.options = 0,

	.offs = 4,

	.len = 1,

	.pattern = scan_ff_pattern

};



static struct nand_ecclayout akita_oobinfo = {

	.eccbytes = 24,

	.eccpos = {

		   0x5, 0x1, 0x2, 0x3, 0x6, 0x7, 0x15, 0x11,

		   0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23,

		   0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37},

	.oobfree = {{0x08, 0x09}}

};



static void __init akita_init(void)

{

	spitz_ficp_platform_data.transceiver_mode = akita_irda_transceiver_mode;



	sharpsl_nand_platform_data.badblock_pattern = &sharpsl_akita_bbt;

	sharpsl_nand_platform_data.ecc_layout = &akita_oobinfo;



	/* We just pretend the second element of the array doesn't exist */

	spitz_pcmcia_config.num_devs = 1;

	platform_scoop_config = &spitz_pcmcia_config;

drivers/mtd/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -45,6 +45,14 @@ config MTD_PARTITIONS 
	  devices. Partitioning on NFTL 'devices' is a different - that's the

	  'normal' form of partitioning used on a block device.



config MTD_TESTS

	tristate "MTD tests support"

	depends on m

	help

	  This option includes various MTD tests into compilation. The tests

	  should normally be compiled as kernel modules. The modules perform

	  various checks and verifications when loaded.



config MTD_REDBOOT_PARTS

	tristate "RedBoot partition table parsing"

	depends on MTD_PARTITIONS
@@ -316,6 +324,8 @@ source "drivers/mtd/nand/Kconfig" 


source "drivers/mtd/onenand/Kconfig"



source "drivers/mtd/lpddr/Kconfig"



source "drivers/mtd/ubi/Kconfig"



endif # MTD

CRA Git | Maintained and supported by SUSTech CRA and CCSE