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

e0d65113 · Linus Torvalds <[email protected]> · 2011-11-07 09:11:16 -08:00

* git://git.infradead.org/mtd-2.6: (226 commits)
  mtd: tests: annotate as DANGEROUS in Kconfig
  mtd: tests: don't use mtd0 as a default
  mtd: clean up usage of MTD_DOCPROBE_ADDRESS
  jffs2: add compr=lzo and compr=zlib options
  jffs2: implement mount option parsing and compression overriding
  mtd: nand: initialize ops.mode
  mtd: provide an alias for the redboot module name
  mtd: m25p80: don't probe device which has status of 'disabled'
  mtd: nand_h1900 never worked
  mtd: Add DiskOnChip G3 support
  mtd: m25p80: add EON flash EN25Q32B into spi flash id table
  mtd: mark block device queue as non-rotational
  mtd: r852: make r852_pm_ops static
  mtd: m25p80: add support for at25df321a spi data flash
  mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
  mtd: nand: switch `check_pattern()' to standard `memcmp()'
  mtd: nand: invalidate cache on unaligned reads
  mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
  mtd: nand: wait to set BBT version
  mtd: nand: scrub BBT on ECC errors
  ...

Fix up trivial conflicts:
 - arch/arm/mach-at91/board-usb-a9260.c
	Merged into board-usb-a926x.c
 - drivers/mtd/maps/lantiq-flash.c
	add_mtd_partitions -> mtd_device_register vs changed to use
	mtd_device_parse_register.

Commit: e0d65113a70f1dc514e625cc4e7a7485a4bf72df
Parents: cf5e15fb · 48e546b7

Merge commit. Changes below are compared with the first parent: cf5e15fb.

Changes

190 files changed · +7583 −4046

File	Status	Add	Del	Content
Documentation/DocBook/mtdnand.tmpl	modified	+1	−18	View file
Documentation/devicetree/bindings/mtd/atmel-dataflash.txt	added	+14	−0	View file
arch/arm/mach-at91/board-afeb-9260v1.c	modified	+2	−7	View file
arch/arm/mach-at91/board-cam60.c	modified	+2	−7	View file
arch/arm/mach-at91/board-cap9adk.c	modified	+2	−7	View file
arch/arm/mach-at91/board-kb9202.c	modified	+2	−7	View file
arch/arm/mach-at91/board-neocore926.c	modified	+2	−7	View file
arch/arm/mach-at91/board-qil-a9260.c	modified	+2	−7	View file
arch/arm/mach-at91/board-rm9200dk.c	modified	+2	−7	View file
arch/arm/mach-at91/board-sam9-l9260.c	modified	+2	−7	View file
arch/arm/mach-at91/board-sam9260ek.c	modified	+2	−7	View file
arch/arm/mach-at91/board-sam9261ek.c	modified	+2	−7	View file
arch/arm/mach-at91/board-sam9263ek.c	modified	+2	−7	View file
arch/arm/mach-at91/board-sam9g20ek.c	modified	+2	−7	View file
arch/arm/mach-at91/board-sam9m10g45ek.c	modified	+2	−7	View file
arch/arm/mach-at91/board-sam9rlek.c	modified	+2	−7	View file
arch/arm/mach-at91/board-snapper9260.c	modified	+2	−8	View file
arch/arm/mach-at91/board-usb-a926x.c	modified	+2	−7	View file
arch/arm/mach-at91/board-yl-9200.c	modified	+2	−7	View file
arch/arm/mach-at91/include/mach/board.h	modified	+2	−1	View file
arch/arm/mach-davinci/board-da830-evm.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-da850-evm.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-dm355-evm.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-dm355-leopard.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-dm365-evm.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-dm644x-evm.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-mityomapl138.c	modified	+2	−1	View file
arch/arm/mach-davinci/board-neuros-osd2.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-tnetv107x-evm.c	modified	+1	−1	View file
arch/arm/mach-davinci/include/mach/nand.h	modified	+3	−1	View file
arch/arm/mach-ep93xx/ts72xx.c	modified	+5	−18	View file
arch/arm/mach-mmp/aspenite.c	modified	+3	−2	View file
arch/arm/mach-orion5x/ts78xx-setup.c	modified	+1	−1	View file
arch/arm/mach-pxa/cm-x300.c	modified	+3	−2	View file
arch/arm/mach-pxa/colibri-pxa3xx.c	modified	+3	−2	View file
arch/arm/mach-pxa/littleton.c	modified	+3	−2	View file
arch/arm/mach-pxa/mxm8x10.c	modified	+5	−4	View file
arch/arm/mach-pxa/raumfeld.c	modified	+3	−2	View file
arch/arm/mach-pxa/zylonite.c	modified	+3	−2	View file
arch/arm/plat-pxa/include/plat/pxa3xx_nand.h	modified	+18	−2	View file
arch/avr32/boards/atngw100/setup.c	modified	+2	−6	View file
arch/avr32/boards/atstk1000/atstk1002.c	modified	+2	−7	View file
arch/avr32/mach-at32ap/include/mach/board.h	modified	+2	−1	View file
arch/cris/arch-v32/drivers/mach-a3/nandflash.c	modified	+1	−1	View file
arch/cris/arch-v32/drivers/mach-fs/nandflash.c	modified	+1	−1	View file
drivers/mtd/Kconfig	modified	+6	−15	View file
drivers/mtd/Makefile	modified	+1	−1	View file
drivers/mtd/afs.c	modified	+2	−2	View file
drivers/mtd/ar7part.c	modified	+1	−1	View file
drivers/mtd/chips/cfi_cmdset_0002.c	modified	+13	−18	View file
drivers/mtd/chips/fwh_lock.h	modified	+1	−2	View file
drivers/mtd/chips/jedec_probe.c	modified	+13	−21	View file
drivers/mtd/cmdlinepart.c	modified	+2	−5	View file
drivers/mtd/devices/Kconfig	modified	+11	−2	View file
drivers/mtd/devices/Makefile	modified	+3	−0	View file
drivers/mtd/devices/doc2000.c	modified	+7	−10	View file
drivers/mtd/devices/doc2001.c	modified	+5	−6	View file
drivers/mtd/devices/doc2001plus.c	modified	+5	−6	View file
drivers/mtd/devices/docecc.c	modified	+1	−1	View file
drivers/mtd/devices/docg3.c	added	+1114	−0	View file
drivers/mtd/devices/docg3.h	added	+297	−0	View file
drivers/mtd/devices/docprobe.c	modified	+0	−5	View file
drivers/mtd/devices/lart.c	modified	+1	−17	View file
drivers/mtd/devices/m25p80.c	modified	+30	−62	View file
drivers/mtd/devices/mtd_dataflash.c	modified	+42	−49	View file
drivers/mtd/devices/sst25l.c	modified	+5	−37	View file
drivers/mtd/ftl.c	modified	+20	−20	View file
drivers/mtd/inftlcore.c	modified	+32	−37	View file
drivers/mtd/inftlmount.c	modified	+50	−66	View file
drivers/mtd/maps/Kconfig	modified	+0	−26	View file
drivers/mtd/maps/Makefile	modified	+0	−2	View file
drivers/mtd/maps/bfin-async-flash.c	modified	+2	−14	View file
drivers/mtd/maps/ceiva.c	deleted	+0	−341	View before deletion
drivers/mtd/maps/dc21285.c	modified	+1	−8	View file
drivers/mtd/maps/edb7312.c	deleted	+0	−134	View before deletion
drivers/mtd/maps/gpio-addr-flash.c	modified	+2	−14	View file
drivers/mtd/maps/h720x-flash.c	modified	+2	−21	View file
drivers/mtd/maps/impa7.c	modified	+4	−24	View file
drivers/mtd/maps/intel_vr_nor.c	modified	+1	−6	View file
drivers/mtd/maps/ixp2000.c	modified	+1	−10	View file
drivers/mtd/maps/ixp4xx.c	modified	+4	−25	View file
drivers/mtd/maps/lantiq-flash.c	modified	+2	−15	View file
drivers/mtd/maps/latch-addr-flash.c	modified	+2	−22	View file
drivers/mtd/maps/pcmciamtd.c	modified	+52	−72	View file
drivers/mtd/maps/physmap.c	modified	+2	−36	View file
drivers/mtd/maps/physmap_of.c	modified	+7	−73	View file
drivers/mtd/maps/plat-ram.c	modified	+2	−21	View file
drivers/mtd/maps/pxa2xx-flash.c	modified	+1	−19	View file
drivers/mtd/maps/rbtx4939-flash.c	modified	+4	−20	View file
drivers/mtd/maps/sa1100-flash.c	modified	+3	−27	View file
drivers/mtd/maps/solutionengine.c	modified	+7	−23	View file
drivers/mtd/maps/wr_sbc82xx_flash.c	modified	+13	−20	View file
drivers/mtd/mtd_blkdevs.c	modified	+2	−0	View file
drivers/mtd/mtdblock.c	modified	+8	−10	View file
drivers/mtd/mtdchar.c	modified	+120	−42	View file
drivers/mtd/mtdconcat.c	modified	+5	−5	View file
drivers/mtd/mtdcore.c	modified	+53	−17	View file
drivers/mtd/mtdcore.h	modified	+3	−0	View file
drivers/mtd/mtdoops.c	modified	+1	−1	View file
drivers/mtd/mtdpart.c	modified	+54	−8	View file
drivers/mtd/mtdsuper.c	modified	+10	−10	View file
drivers/mtd/mtdswap.c	modified	+15	−16	View file
drivers/mtd/nand/Kconfig	modified	+18	−11	View file
drivers/mtd/nand/Makefile	modified	+1	−1	View file
drivers/mtd/nand/atmel_nand.c	modified	+8	−66	View file
drivers/mtd/nand/au1550nd.c	modified	+13	−16	View file
drivers/mtd/nand/autcpu12.c	modified	+2	−2	View file
drivers/mtd/nand/bcm_umi_nand.c	modified	+21	−36	View file
drivers/mtd/nand/cafe_nand.c	modified	+5	−16	View file
drivers/mtd/nand/cmx270_nand.c	modified	+2	−21	View file
drivers/mtd/nand/cs553x_nand.c	modified	+4	−11	View file
drivers/mtd/nand/davinci_nand.c	modified	+5	−34	View file
drivers/mtd/nand/denali.c	modified	+3	−3	View file
drivers/mtd/nand/diskonchip.c	modified	+4	−4	View file
drivers/mtd/nand/edb7312.c	deleted	+0	−203	View before deletion
drivers/mtd/nand/fsl_elbc_nand.c	modified	+28	−47	View file
drivers/mtd/nand/fsl_upm.c	modified	+5	−11	View file
drivers/mtd/nand/fsmc_nand.c	modified	+11	−66	View file
drivers/mtd/nand/gpmi-nand/Makefile	added	+3	−0	View file
drivers/mtd/nand/gpmi-nand/bch-regs.h	added	+84	−0	View file
drivers/mtd/nand/gpmi-nand/gpmi-lib.c	added	+1057	−0	View file
drivers/mtd/nand/gpmi-nand/gpmi-nand.c	added	+1619	−0	View file
drivers/mtd/nand/gpmi-nand/gpmi-nand.h	added	+273	−0	View file
drivers/mtd/nand/gpmi-nand/gpmi-regs.h	added	+172	−0	View file
drivers/mtd/nand/h1910.c	modified	+2	−17	View file
drivers/mtd/nand/jz4740_nand.c	modified	+3	−15	View file
drivers/mtd/nand/mpc5121_nfc.c	modified	+5	−17	View file
drivers/mtd/nand/mxc_nand.c	modified	+12	−25	View file
drivers/mtd/nand/nand_base.c	modified	+558	−551	View file
drivers/mtd/nand/nand_bbt.c	modified	+324	−368	View file
drivers/mtd/nand/nand_bch.c	modified	+2	−2	View file
drivers/mtd/nand/nand_ecc.c	modified	+5	−5	View file
drivers/mtd/nand/nandsim.c	modified	+2	−2	View file
drivers/mtd/nand/ndfc.c	modified	+4	−18	View file
drivers/mtd/nand/nomadik_nand.c	modified	+1	−0	View file
drivers/mtd/nand/nuc900_nand.c	modified	+1	−0	View file
drivers/mtd/nand/omap2.c	modified	+7	−15	View file
drivers/mtd/nand/orion_nand.c	modified	+2	−14	View file
drivers/mtd/nand/pasemi_nand.c	modified	+2	−1	View file
drivers/mtd/nand/plat_nand.c	modified	+4	−21	View file
drivers/mtd/nand/ppchameleonevb.c	modified	+10	−37	View file
drivers/mtd/nand/pxa3xx_nand.c	modified	+291	−180	View file
drivers/mtd/nand/r852.c	modified	+3	−3	View file
drivers/mtd/nand/rtc_from4.c	modified	+2	−3	View file
drivers/mtd/nand/s3c2410.c	modified	+9	−18	View file
drivers/mtd/nand/sharpsl.c	modified	+2	−11	View file
drivers/mtd/nand/sm_common.c	modified	+1	−1	View file
drivers/mtd/nand/socrates_nand.c	modified	+3	−25	View file
drivers/mtd/nand/tmio_nand.c	modified	+3	−14	View file
drivers/mtd/nand/txx9ndfmc.c	modified	+1	−7	View file
drivers/mtd/nftlcore.c	modified	+17	−20	View file
drivers/mtd/nftlmount.c	modified	+13	−13	View file
drivers/mtd/ofpart.c	modified	+107	−5	View file
drivers/mtd/onenand/generic.c	modified	+3	−11	View file
drivers/mtd/onenand/omap2.c	modified	+4	−12	View file
drivers/mtd/onenand/onenand_base.c	modified	+65	−49	View file
drivers/mtd/onenand/onenand_bbt.c	modified	+3	−5	View file
drivers/mtd/onenand/samsung.c	modified	+3	−10	View file
drivers/mtd/redboot.c	modified	+9	−7	View file
drivers/mtd/sm_ftl.c	modified	+13	−13	View file
drivers/mtd/ssfdc.c	modified	+16	−30	View file
drivers/mtd/tests/mtd_oobtest.c	modified	+20	−13	View file
drivers/mtd/tests/mtd_pagetest.c	modified	+22	−15	View file
drivers/mtd/tests/mtd_readtest.c	modified	+10	−3	View file
drivers/mtd/tests/mtd_speedtest.c	modified	+12	−5	View file
drivers/mtd/tests/mtd_stresstest.c	modified	+9	−2	View file
drivers/mtd/tests/mtd_subpagetest.c	modified	+12	−5	View file
drivers/mtd/tests/mtd_torturetest.c	modified	+9	−2	View file
drivers/mtd/ubi/eba.c	modified	+1	−1	View file
drivers/mtd/ubi/io.c	modified	+12	−12	View file
drivers/mtd/ubi/kapi.c	modified	+1	−1	View file
drivers/mtd/ubi/misc.c	modified	+1	−1	View file
drivers/mtd/ubi/scan.c	modified	+2	−2	View file
drivers/mtd/ubi/vtbl.c	modified	+1	−1	View file
drivers/staging/spectra/lld_mtd.c	modified	+3	−3	View file
fs/jffs2/compr.c	modified	+91	−37	View file
fs/jffs2/compr.h	modified	+2	−0	View file
fs/jffs2/fs.c	modified	+1	−1	View file
fs/jffs2/jffs2_fs_sb.h	modified	+6	−0	View file
fs/jffs2/os-linux.h	modified	+1	−1	View file
fs/jffs2/scan.c	modified	+1	−3	View file
fs/jffs2/super.c	modified	+119	−0	View file
fs/jffs2/wbuf.c	modified	+4	−5	View file
include/linux/mtd/bbm.h	modified	+27	−12	View file
include/linux/mtd/mtd.h	modified	+32	−50	View file
include/linux/mtd/nand.h	modified	+43	−49	View file
include/linux/mtd/onenand.h	modified	+4	−0	View file
include/linux/mtd/partitions.h	modified	+18	−28	View file
include/linux/mtd/physmap.h	modified	+0	−17	View file
include/mtd/mtd-abi.h	modified	+105	−17	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/DocBook/mtdnand.tmpl

View file

diff --git a/Documentation/DocBook/mtdnand.tmpl b/Documentation/DocBook/mtdnand.tmpl
index 17910e2..0c674be 100644
--- a/Documentation/DocBook/mtdnand.tmpl
+++ b/Documentation/DocBook/mtdnand.tmpl
@@ -572,7 +572,7 @@ static void board_select_chip (struct mtd_info *mtd, int chip)
 			</para>
 			<para>
 				The simplest way to activate the FLASH based bad block table support 
-				is to set the option NAND_USE_FLASH_BBT in the option field of
+				is to set the option NAND_BBT_USE_FLASH in the bbt_option field of
 				the nand chip structure before calling nand_scan(). For AG-AND
 				chips is this done by default.
 				This activates the default FLASH based bad block table functionality 
@@ -773,20 +773,6 @@ struct nand_oobinfo {
 				done according to the default builtin scheme.
 			</para>
 		</sect2>
-		<sect2 id="User_space_placement_selection">
-			<title>User space placement selection</title>
-		<para>
-			All non ecc functions like mtd->read and mtd->write use an internal 
-			structure, which can be set by an ioctl. This structure is preset 
-			to the autoplacement default.
-	     		<programlisting>
-	ioctl (fd, MEMSETOOBSEL, oobsel);
-	     		</programlisting>
-			oobsel is a pointer to a user supplied structure of type
-			nand_oobconfig. The contents of this structure must match the 
-			criteria of the filesystem, which will be used. See an example in utils/nandwrite.c.
-		</para>
-		</sect2>
 	</sect1>	
 	<sect1 id="Spare_area_autoplacement_default">
 		<title>Spare area autoplacement default schemes</title>
@@ -1158,9 +1144,6 @@ in this page</entry>
 		These constants are defined in nand.h. They are ored together to describe
 		the functionality.
      		<programlisting>
-/* Use a flash based bad block table. This option is parsed by the
- * default bad block table function (nand_default_bbt). */
-#define NAND_USE_FLASH_BBT	0x00010000
 /* The hw ecc generator provides a syndrome instead a ecc value on read 
  * This can only work if we have the ecc bytes directly behind the 
  * data bytes. Applies for DOC and AG-AND Renesas HW Reed Solomon generators */

Documentation/devicetree/bindings/mtd/atmel-dataflash.txt

View file

diff --git a/Documentation/devicetree/bindings/mtd/atmel-dataflash.txt b/Documentation/devicetree/bindings/mtd/atmel-dataflash.txt
new file mode 100644
index 0000000..ef66ddd
--- /dev/null
+++ b/Documentation/devicetree/bindings/mtd/atmel-dataflash.txt
@@ -0,0 +1,14 @@
+* Atmel Data Flash
+
+Required properties:
+- compatible : "atmel,<model>", "atmel,<series>", "atmel,dataflash".
+
+Example:
+
+flash@1 {
+	#address-cells = <1>;
+	#size-cells = <1>;
+	compatible = "atmel,at45db321d", "atmel,at45", "atmel,dataflash";
+	spi-max-frequency = <25000000>;
+	reg = <1>;
+};

arch/arm/mach-at91/board-afeb-9260v1.c

View file

diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c
index 0487ea1..4282d96 100644
--- a/arch/arm/mach-at91/board-afeb-9260v1.c
+++ b/arch/arm/mach-at91/board-afeb-9260v1.c
@@ -130,19 +130,14 @@ static struct mtd_partition __initdata afeb9260_nand_partition[] = {
 	},
 };
 
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
-	*num_partitions = ARRAY_SIZE(afeb9260_nand_partition);
-	return afeb9260_nand_partition;
-}
-
 static struct atmel_nand_data __initdata afeb9260_nand_data = {
 	.ale		= 21,
 	.cle		= 22,
 	.rdy_pin	= AT91_PIN_PC13,
 	.enable_pin	= AT91_PIN_PC14,
-	.partition_info	= nand_partitions,
 	.bus_width_16	= 0,
+	.parts		= afeb9260_nand_partition,
+	.num_parts	= ARRAY_SIZE(afeb9260_nand_partition),
 };
 
 

arch/arm/mach-at91/board-cam60.c

View file

diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c
index 747b2ea..f90cfb3 100644
--- a/arch/arm/mach-at91/board-cam60.c
+++ b/arch/arm/mach-at91/board-cam60.c
@@ -132,19 +132,14 @@ static struct mtd_partition __initdata cam60_nand_partition[] = {
 	},
 };
 
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
-	*num_partitions = ARRAY_SIZE(cam60_nand_partition);
-	return cam60_nand_partition;
-}
-
 static struct atmel_nand_data __initdata cam60_nand_data = {
 	.ale		= 21,
 	.cle		= 22,
 	// .det_pin	= ... not there
 	.rdy_pin	= AT91_PIN_PA9,
 	.enable_pin	= AT91_PIN_PA7,
-	.partition_info	= nand_partitions,
+	.parts		= cam60_nand_partition,
+	.num_parts	= ARRAY_SIZE(cam60_nand_partition),
 };
 
 static struct sam9_smc_config __initdata cam60_nand_smc_config = {

arch/arm/mach-at91/board-cap9adk.c

View file

diff --git a/arch/arm/mach-at91/board-cap9adk.c b/arch/arm/mach-at91/board-cap9adk.c
index 0626703..5dffd3b 100644
--- a/arch/arm/mach-at91/board-cap9adk.c
+++ b/arch/arm/mach-at91/board-cap9adk.c
@@ -169,19 +169,14 @@ static struct mtd_partition __initdata cap9adk_nand_partitions[] = {
 	},
 };
 
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
-	*num_partitions = ARRAY_SIZE(cap9adk_nand_partitions);
-	return cap9adk_nand_partitions;
-}
-
 static struct atmel_nand_data __initdata cap9adk_nand_data = {
 	.ale		= 21,
 	.cle		= 22,
 //	.det_pin	= ... not connected
 //	.rdy_pin	= ... not connected
 	.enable_pin	= AT91_PIN_PD15,
-	.partition_info	= nand_partitions,
+	.parts		= cap9adk_nand_partitions,
+	.num_parts	= ARRAY_SIZE(cap9adk_nand_partitions),
 };
 
 static struct sam9_smc_config __initdata cap9adk_nand_smc_config = {

arch/arm/mach-at91/board-kb9202.c

View file

diff --git a/arch/arm/mach-at91/board-kb9202.c b/arch/arm/mach-at91/board-kb9202.c
index 15a3f1a..e61351f 100644
--- a/arch/arm/mach-at91/board-kb9202.c
+++ b/arch/arm/mach-at91/board-kb9202.c
@@ -97,19 +97,14 @@ static struct mtd_partition __initdata kb9202_nand_partition[] = {
 	},
 };
 
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
-	*num_partitions = ARRAY_SIZE(kb9202_nand_partition);
-	return kb9202_nand_partition;
-}
-
 static struct atmel_nand_data __initdata kb9202_nand_data = {
 	.ale		= 22,
 	.cle		= 21,
 	// .det_pin	= ... not there
 	.rdy_pin	= AT91_PIN_PC29,
 	.enable_pin	= AT91_PIN_PC28,
-	.partition_info	= nand_partitions,
+	.parts		= kb9202_nand_partition,
+	.num_parts	= ARRAY_SIZE(kb9202_nand_partition),
 };
 
 static void __init kb9202_board_init(void)

arch/arm/mach-at91/board-neocore926.c

View file

diff --git a/arch/arm/mach-at91/board-neocore926.c b/arch/arm/mach-at91/board-neocore926.c
index 6094496..ef816c1 100644
--- a/arch/arm/mach-at91/board-neocore926.c
+++ b/arch/arm/mach-at91/board-neocore926.c
@@ -182,19 +182,14 @@ static struct mtd_partition __initdata neocore926_nand_partition[] = {
 	},
 };
 
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
-	*num_partitions = ARRAY_SIZE(neocore926_nand_partition);
-	return neocore926_nand_partition;
-}
-
 static struct atmel_nand_data __initdata neocore926_nand_data = {
 	.ale			= 21,
 	.cle			= 22,
 	.rdy_pin		= AT91_PIN_PB19,
 	.rdy_pin_active_low	= 1,
 	.enable_pin		= AT91_PIN_PD15,
-	.partition_info		= nand_partitions,
+	.parts			= neocore926_nand_partition,
+	.num_parts		= ARRAY_SIZE(neocore926_nand_partition),
 };
 
 static struct sam9_smc_config __initdata neocore926_nand_smc_config = {

arch/arm/mach-at91/board-qil-a9260.c

View file

diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c
index 938cc39..07421bd 100644
--- a/arch/arm/mach-at91/board-qil-a9260.c
+++ b/arch/arm/mach-at91/board-qil-a9260.c
@@ -130,19 +130,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
 	},
 };
 
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
-	*num_partitions = ARRAY_SIZE(ek_nand_partition);
-	return ek_nand_partition;
-}
-
 static struct atmel_nand_data __initdata ek_nand_data = {
 	.ale		= 21,
 	.cle		= 22,
 //	.det_pin	= ... not connected
 	.rdy_pin	= AT91_PIN_PC13,
 	.enable_pin	= AT91_PIN_PC14,
-	.partition_info	= nand_partitions,
+	.parts		= ek_nand_partition,
+	.num_parts	= ARRAY_SIZE(ek_nand_partition),
 };
 
 static struct sam9_smc_config __initdata ek_nand_smc_config = {

arch/arm/mach-at91/board-rm9200dk.c

View file

diff --git a/arch/arm/mach-at91/board-rm9200dk.c b/arch/arm/mach-at91/board-rm9200dk.c
index b4ac30e..80a8c9c 100644
--- a/arch/arm/mach-at91/board-rm9200dk.c
+++ b/arch/arm/mach-at91/board-rm9200dk.c
@@ -138,19 +138,14 @@ static struct mtd_partition __initdata dk_nand_partition[] = {
 	},
 };
 
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
-	*num_partitions = ARRAY_SIZE(dk_nand_partition);
-	return dk_nand_partition;
-}
-
 static struct atmel_nand_data __initdata dk_nand_data = {
 	.ale		= 22,
 	.cle		= 21,
 	.det_pin	= AT91_PIN_PB1,
 	.rdy_pin	= AT91_PIN_PC2,
 	// .enable_pin	= ... not there
-	.partition_info	= nand_partitions,
+	.parts		= dk_nand_partition,
+	.num_parts	= ARRAY_SIZE(dk_nand_partition),
 };
 
 #define DK_FLASH_BASE	AT91_CHIPSELECT_0

arch/arm/mach-at91/board-sam9-l9260.c

View file

diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c
index 2a21e79..072d53a 100644
--- a/arch/arm/mach-at91/board-sam9-l9260.c
+++ b/arch/arm/mach-at91/board-sam9-l9260.c
@@ -131,19 +131,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
 	},
 };
 
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
-	*num_partitions = ARRAY_SIZE(ek_nand_partition);
-	return ek_nand_partition;
-}
-
 static struct atmel_nand_data __initdata ek_nand_data = {
 	.ale		= 21,
 	.cle		= 22,
 //	.det_pin	= ... not connected
 	.rdy_pin	= AT91_PIN_PC13,
 	.enable_pin	= AT91_PIN_PC14,
-	.partition_info	= nand_partitions,
+	.parts		= ek_nand_partition,
+	.num_parts	= ARRAY_SIZE(ek_nand_partition),
 };
 
 static struct sam9_smc_config __initdata ek_nand_smc_config = {

arch/arm/mach-at91/board-sam9260ek.c

View file

diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c
index 89c8b57..4f10181 100644
--- a/arch/arm/mach-at91/board-sam9260ek.c
+++ b/arch/arm/mach-at91/board-sam9260ek.c
@@ -173,19 +173,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
 	},
 };
 
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
-	*num_partitions = ARRAY_SIZE(ek_nand_partition);
-	return ek_nand_partition;
-}
-
 static struct atmel_nand_data __initdata ek_nand_data = {
 	.ale		= 21,
 	.cle		= 22,
 //	.det_pin	= ... not connected
 	.rdy_pin	= AT91_PIN_PC13,
 	.enable_pin	= AT91_PIN_PC14,
-	.partition_info	= nand_partitions,
+	.parts		= ek_nand_partition,
+	.num_parts	= ARRAY_SIZE(ek_nand_partition),
 };
 
 static struct sam9_smc_config __initdata ek_nand_smc_config = {

arch/arm/mach-at91/board-sam9261ek.c

View file

diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
index 3741f43..b005b73 100644
--- a/arch/arm/mach-at91/board-sam9261ek.c
+++ b/arch/arm/mach-at91/board-sam9261ek.c
@@ -179,19 +179,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
 	},
 };
 
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
-	*num_partitions = ARRAY_SIZE(ek_nand_partition);
-	return ek_nand_partition;
-}
-
 static struct atmel_nand_data __initdata ek_nand_data = {
 	.ale		= 22,
 	.cle		= 21,
 //	.det_pin	= ... not connected
 	.rdy_pin	= AT91_PIN_PC15,
 	.enable_pin	= AT91_PIN_PC14,
-	.partition_info	= nand_partitions,
+	.parts		= ek_nand_partition,
+	.num_parts	= ARRAY_SIZE(ek_nand_partition),
 };
 
 static struct sam9_smc_config __initdata ek_nand_smc_config = {

arch/arm/mach-at91/board-sam9263ek.c

View file

diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c
index a580dd4..bccdcf2 100644
--- a/arch/arm/mach-at91/board-sam9263ek.c
+++ b/arch/arm/mach-at91/board-sam9263ek.c
@@ -180,19 +180,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
 	},
 };
 
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
-	*num_partitions = ARRAY_SIZE(ek_nand_partition);
-	return ek_nand_partition;
-}
-
 static struct atmel_nand_data __initdata ek_nand_data = {
 	.ale		= 21,
 	.cle		= 22,
 //	.det_pin	= ... not connected
 	.rdy_pin	= AT91_PIN_PA22,
 	.enable_pin	= AT91_PIN_PD15,
-	.partition_info	= nand_partitions,
+	.parts		= ek_nand_partition,
+	.num_parts	= ARRAY_SIZE(ek_nand_partition),
 };
 
 static struct sam9_smc_config __initdata ek_nand_smc_config = {

arch/arm/mach-at91/board-sam9g20ek.c

View file

diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c
index 8d77c2f..64fc75c 100644
--- a/arch/arm/mach-at91/board-sam9g20ek.c
+++ b/arch/arm/mach-at91/board-sam9g20ek.c
@@ -157,19 +157,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
 	},
 };
 
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
-	*num_partitions = ARRAY_SIZE(ek_nand_partition);
-	return ek_nand_partition;
-}
-
 /* det_pin is not connected */
 static struct atmel_nand_data __initdata ek_nand_data = {
 	.ale		= 21,
 	.cle		= 22,
 	.rdy_pin	= AT91_PIN_PC13,
 	.enable_pin	= AT91_PIN_PC14,
-	.partition_info	= nand_partitions,
+	.parts		= ek_nand_partition,
+	.num_parts	= ARRAY_SIZE(ek_nand_partition),
 };
 
 static struct sam9_smc_config __initdata ek_nand_smc_config = {

arch/arm/mach-at91/board-sam9m10g45ek.c

View file

diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
index 2d6203a..92de912 100644
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@ -137,19 +137,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
 	},
 };
 
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
-	*num_partitions = ARRAY_SIZE(ek_nand_partition);
-	return ek_nand_partition;
-}
-
 /* det_pin is not connected */
 static struct atmel_nand_data __initdata ek_nand_data = {
 	.ale		= 21,
 	.cle		= 22,
 	.rdy_pin	= AT91_PIN_PC8,
 	.enable_pin	= AT91_PIN_PC14,
-	.partition_info	= nand_partitions,
+	.parts		= ek_nand_partition,
+	.num_parts	= ARRAY_SIZE(ek_nand_partition),
 };
 
 static struct sam9_smc_config __initdata ek_nand_smc_config = {

arch/arm/mach-at91/board-sam9rlek.c

View file

diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c
index 39a28ef..b2b7482 100644
--- a/arch/arm/mach-at91/board-sam9rlek.c
+++ b/arch/arm/mach-at91/board-sam9rlek.c
@@ -88,19 +88,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
 	},
 };
 
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
-	*num_partitions = ARRAY_SIZE(ek_nand_partition);
-	return ek_nand_partition;
-}
-
 static struct atmel_nand_data __initdata ek_nand_data = {
 	.ale		= 21,
 	.cle		= 22,
 //	.det_pin	= ... not connected
 	.rdy_pin	= AT91_PIN_PD17,
 	.enable_pin	= AT91_PIN_PB6,
-	.partition_info	= nand_partitions,
+	.parts		= ek_nand_partition,
+	.num_parts	= ARRAY_SIZE(ek_nand_partition),
 };
 
 static struct sam9_smc_config __initdata ek_nand_smc_config = {

arch/arm/mach-at91/board-snapper9260.c

View file

diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c
index c73d25e..0df01c6 100644
--- a/arch/arm/mach-at91/board-snapper9260.c
+++ b/arch/arm/mach-at91/board-snapper9260.c
@@ -97,18 +97,12 @@ static struct mtd_partition __initdata snapper9260_nand_partitions[] = {
 	},
 };
 
-static struct mtd_partition * __init
-snapper9260_nand_partition_info(int size, int *num_partitions)
-{
-	*num_partitions = ARRAY_SIZE(snapper9260_nand_partitions);
-	return snapper9260_nand_partitions;
-}
-
 static struct atmel_nand_data __initdata snapper9260_nand_data = {
 	.ale		= 21,
 	.cle		= 22,
 	.rdy_pin	= AT91_PIN_PC13,
-	.partition_info	= snapper9260_nand_partition_info,
+	.parts		= snapper9260_nand_partitions,
+	.num_parts	= ARRAY_SIZE(snapper9260_nand_partitions),
 	.bus_width_16	= 0,
 };
 

arch/arm/mach-at91/board-usb-a926x.c

View file

diff --git a/arch/arm/mach-at91/board-usb-a926x.c b/arch/arm/mach-at91/board-usb-a926x.c
index 5852d3d..0a20bab 100644
--- a/arch/arm/mach-at91/board-usb-a926x.c
+++ b/arch/arm/mach-at91/board-usb-a926x.c
@@ -190,19 +190,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
 	}
 };
 
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
-	*num_partitions = ARRAY_SIZE(ek_nand_partition);
-	return ek_nand_partition;
-}
-
 static struct atmel_nand_data __initdata ek_nand_data = {
 	.ale		= 21,
 	.cle		= 22,
 //	.det_pin	= ... not connected
 	.rdy_pin	= AT91_PIN_PA22,
 	.enable_pin	= AT91_PIN_PD15,
-	.partition_info	= nand_partitions,
+	.parts		= ek_nand_partition,
+	.num_parts	= ARRAY_SIZE(ek_nand_partition),
 };
 
 static struct sam9_smc_config __initdata usb_a9260_nand_smc_config = {

arch/arm/mach-at91/board-yl-9200.c

View file

diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c
index 3c288b3..649b052 100644
--- a/arch/arm/mach-at91/board-yl-9200.c
+++ b/arch/arm/mach-at91/board-yl-9200.c
@@ -172,19 +172,14 @@ static struct mtd_partition __initdata yl9200_nand_partition[] = {
 	}
 };
 
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
-	*num_partitions = ARRAY_SIZE(yl9200_nand_partition);
-	return yl9200_nand_partition;
-}
-
 static struct atmel_nand_data __initdata yl9200_nand_data = {
 	.ale		= 6,
 	.cle		= 7,
 	// .det_pin	= ... not connected
 	.rdy_pin	= AT91_PIN_PC14,	/* R/!B (Sheet10) */
 	.enable_pin	= AT91_PIN_PC15,	/* !CE  (Sheet10) */
-	.partition_info	= nand_partitions,
+	.parts		= yl9200_nand_partition,
+	.num_parts	= ARRAY_SIZE(yl9200_nand_partition),
 };
 
 /*

arch/arm/mach-at91/include/mach/board.h

View file

diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h
index d07767f..eac92e9 100644
--- a/arch/arm/mach-at91/include/mach/board.h
+++ b/arch/arm/mach-at91/include/mach/board.h
@@ -117,7 +117,8 @@ struct atmel_nand_data {
 	u8		ale;		/* address line number connected to ALE */
 	u8		cle;		/* address line number connected to CLE */
 	u8		bus_width_16;	/* buswidth is 16 bit */
-	struct mtd_partition* (*partition_info)(int, int*);
+	struct mtd_partition *parts;
+	unsigned int	num_parts;
 };
 extern void __init at91_add_device_nand(struct atmel_nand_data *data);
 

arch/arm/mach-davinci/board-da830-evm.c

View file

diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index 26d94c0..11c3db9 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -377,7 +377,7 @@ static struct davinci_nand_pdata da830_evm_nand_pdata = {
 	.nr_parts	= ARRAY_SIZE(da830_evm_nand_partitions),
 	.ecc_mode	= NAND_ECC_HW,
 	.ecc_bits	= 4,
-	.options	= NAND_USE_FLASH_BBT,
+	.bbt_options	= NAND_BBT_USE_FLASH,
 	.bbt_td		= &da830_evm_nand_bbt_main_descr,
 	.bbt_md		= &da830_evm_nand_bbt_mirror_descr,
 	.timing         = &da830_evm_nandflash_timing,

arch/arm/mach-davinci/board-da850-evm.c

View file

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index ec21663..1d7d249 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -256,7 +256,7 @@ static struct davinci_nand_pdata da850_evm_nandflash_data = {
 	.nr_parts	= ARRAY_SIZE(da850_evm_nandflash_partition),
 	.ecc_mode	= NAND_ECC_HW,
 	.ecc_bits	= 4,
-	.options	= NAND_USE_FLASH_BBT,
+	.bbt_options	= NAND_BBT_USE_FLASH,
 	.timing		= &da850_evm_nandflash_timing,
 };
 

arch/arm/mach-davinci/board-dm355-evm.c

View file

diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index 6556628..4e0e707 100644
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -77,7 +77,7 @@ static struct davinci_nand_pdata davinci_nand_data = {
 	.parts			= davinci_nand_partitions,
 	.nr_parts		= ARRAY_SIZE(davinci_nand_partitions),
 	.ecc_mode		= NAND_ECC_HW,
-	.options		= NAND_USE_FLASH_BBT,
+	.bbt_options		= NAND_BBT_USE_FLASH,
 	.ecc_bits		= 4,
 };
 

arch/arm/mach-davinci/board-dm355-leopard.c

View file

diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
index b307470..ff2d241 100644
--- a/arch/arm/mach-davinci/board-dm355-leopard.c
+++ b/arch/arm/mach-davinci/board-dm355-leopard.c
@@ -74,7 +74,7 @@ static struct davinci_nand_pdata davinci_nand_data = {
 	.parts			= davinci_nand_partitions,
 	.nr_parts		= ARRAY_SIZE(davinci_nand_partitions),
 	.ecc_mode		= NAND_ECC_HW_SYNDROME,
-	.options		= NAND_USE_FLASH_BBT,
+	.bbt_options		= NAND_BBT_USE_FLASH,
 };
 
 static struct resource davinci_nand_resources[] = {

arch/arm/mach-davinci/board-dm365-evm.c

View file

diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index 04c43ab..1918ae7 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -139,7 +139,7 @@ static struct davinci_nand_pdata davinci_nand_data = {
 	.parts			= davinci_nand_partitions,
 	.nr_parts		= ARRAY_SIZE(davinci_nand_partitions),
 	.ecc_mode		= NAND_ECC_HW,
-	.options		= NAND_USE_FLASH_BBT,
+	.bbt_options		= NAND_BBT_USE_FLASH,
 	.ecc_bits		= 4,
 };
 

arch/arm/mach-davinci/board-dm644x-evm.c

View file

diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index 28fafa7..0cf8abf 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -151,7 +151,7 @@ static struct davinci_nand_pdata davinci_evm_nandflash_data = {
 	.parts		= davinci_evm_nandflash_partition,
 	.nr_parts	= ARRAY_SIZE(davinci_evm_nandflash_partition),
 	.ecc_mode	= NAND_ECC_HW,
-	.options	= NAND_USE_FLASH_BBT,
+	.bbt_options	= NAND_BBT_USE_FLASH,
 	.timing		= &davinci_evm_nandflash_timing,
 };
 

arch/arm/mach-davinci/board-mityomapl138.c

View file

diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
index 6efc84c..3cfff55 100644
--- a/arch/arm/mach-davinci/board-mityomapl138.c

This diff is incomplete. Download the complete patch.