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

29a6ccca · Linus Torvalds <[email protected]> · 2011-05-27 20:06:53 -07:00

* git://git.infradead.org/mtd-2.6: (97 commits)
  mtd: kill CONFIG_MTD_PARTITIONS
  mtd: remove add_mtd_partitions, add_mtd_device and friends
  mtd: convert remaining users to mtd_device_register()
  mtd: samsung onenand: convert to mtd_device_register()
  mtd: omap2 onenand: convert to mtd_device_register()
  mtd: txx9ndfmc: convert to mtd_device_register()
  mtd: tmio_nand: convert to mtd_device_register()
  mtd: socrates_nand: convert to mtd_device_register()
  mtd: sharpsl: convert to mtd_device_register()
  mtd: s3c2410 nand: convert to mtd_device_register()
  mtd: ppchameleonevb: convert to mtd_device_register()
  mtd: orion_nand: convert to mtd_device_register()
  mtd: omap2: convert to mtd_device_register()
  mtd: nomadik_nand: convert to mtd_device_register()
  mtd: ndfc: convert to mtd_device_register()
  mtd: mxc_nand: convert to mtd_device_register()
  mtd: mpc5121_nfc: convert to mtd_device_register()
  mtd: jz4740_nand: convert to mtd_device_register()
  mtd: h1910: convert to mtd_device_register()
  mtd: fsmc_nand: convert to mtd_device_register()
  ...

Fixed up trivial conflicts in
 - drivers/mtd/maps/integrator-flash.c: removed in ARM tree
 - drivers/mtd/maps/physmap.c: addition of afs partition probe type
   clashing with removal of CONFIG_MTD_PARTITIONS

Commit: 29a6ccca3869bbe33879dae0cd7df2a1559eff54
Parents: 42604831 · 6a8a98b2

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

Changes

152 files changed · +1041 −1690

File	Status	Add	Del	Content
Documentation/DocBook/mtdnand.tmpl	modified	+1	−2	View file
arch/arm/mach-gemini/board-wbd111.c	modified	+1	−6	View file
arch/arm/mach-gemini/board-wbd222.c	modified	+1	−6	View file
arch/arm/mach-ixp4xx/ixdp425-setup.c	modified	+0	−4	View file
arch/arm/mach-pxa/Kconfig	modified	+0	−1	View file
arch/arm/mach-s3c2410/mach-amlm5900.c	modified	+0	−5	View file
arch/arm/mach-s3c2410/mach-tct_hammer.c	modified	+0	−6	View file
arch/blackfin/mach-bf537/boards/stamp.c	modified	+0	−4	View file
arch/blackfin/mach-bf561/boards/acvilon.c	modified	+0	−4	View file
arch/cris/Kconfig	modified	+0	−1	View file
arch/cris/arch-v10/drivers/axisflashmap.c	modified	+6	−4	View file
arch/cris/arch-v32/drivers/Kconfig	modified	+0	−1	View file
arch/cris/arch-v32/drivers/axisflashmap.c	modified	+4	−3	View file
arch/mips/cavium-octeon/flash_setup.c	modified	+1	−10	View file
arch/mips/txx9/generic/setup.c	modified	+1	−2	View file
drivers/mtd/Kconfig	modified	+1	−17	View file
drivers/mtd/Makefile	modified	+1	−2	View file
drivers/mtd/chips/cfi_cmdset_0001.c	modified	+3	−7	View file
drivers/mtd/chips/cfi_cmdset_0002.c	modified	+4	−6	View file
drivers/mtd/chips/cfi_cmdset_0020.c	modified	+1	−0	View file
drivers/mtd/devices/block2mtd.c	modified	+2	−2	View file
drivers/mtd/devices/doc2000.c	modified	+2	−2	View file
drivers/mtd/devices/doc2001.c	modified	+2	−2	View file
drivers/mtd/devices/doc2001plus.c	modified	+2	−2	View file
drivers/mtd/devices/lart.c	modified	+5	−4	View file
drivers/mtd/devices/m25p80.c	modified	+61	−48	View file
drivers/mtd/devices/ms02-nv.c	modified	+2	−2	View file
drivers/mtd/devices/mtd_dataflash.c	modified	+18	−27	View file
drivers/mtd/devices/mtdram.c	modified	+2	−3	View file
drivers/mtd/devices/phram.c	modified	+2	−2	View file
drivers/mtd/devices/pmc551.c	modified	+3	−3	View file
drivers/mtd/devices/slram.c	modified	+2	−2	View file
drivers/mtd/devices/sst25l.c	modified	+29	−39	View file
drivers/mtd/lpddr/lpddr_cmds.c	modified	+1	−7	View file
drivers/mtd/maps/Kconfig	modified	+8	−15	View file
drivers/mtd/maps/amd76xrom.c	modified	+2	−2	View file
drivers/mtd/maps/autcpu12-nvram.c	modified	+2	−2	View file
drivers/mtd/maps/bcm963xx-flash.c	modified	+3	−3	View file
drivers/mtd/maps/bfin-async-flash.c	modified	+5	−16	View file
drivers/mtd/maps/cdb89712.c	modified	+6	−6	View file
drivers/mtd/maps/ceiva.c	modified	+3	−3	View file
drivers/mtd/maps/cfi_flagadm.c	modified	+2	−2	View file
drivers/mtd/maps/ck804xrom.c	modified	+2	−2	View file
drivers/mtd/maps/dbox2-flash.c	modified	+2	−2	View file
drivers/mtd/maps/dc21285.c	modified	+3	−17	View file
drivers/mtd/maps/dilnetpc.c	modified	+5	−4	View file
drivers/mtd/maps/dmv182.c	modified	+2	−2	View file
drivers/mtd/maps/edb7312.c	modified	+8	−18	View file
drivers/mtd/maps/esb2rom.c	modified	+2	−2	View file
drivers/mtd/maps/fortunet.c	modified	+4	−3	View file
drivers/mtd/maps/gpio-addr-flash.c	modified	+10	−17	View file
drivers/mtd/maps/h720x-flash.c	modified	+2	−4	View file
drivers/mtd/maps/ichxrom.c	modified	+2	−2	View file
drivers/mtd/maps/impa7.c	modified	+3	−19	View file
drivers/mtd/maps/intel_vr_nor.c	modified	+2	−17	View file
drivers/mtd/maps/ixp2000.c	modified	+2	−2	View file
drivers/mtd/maps/ixp4xx.c	modified	+6	−10	View file
drivers/mtd/maps/l440gx.c	modified	+2	−2	View file
drivers/mtd/maps/latch-addr-flash.c	modified	+17	−28	View file
drivers/mtd/maps/mbx860.c	modified	+3	−3	View file
drivers/mtd/maps/netsc520.c	modified	+2	−2	View file
drivers/mtd/maps/nettel.c	modified	+6	−6	View file
drivers/mtd/maps/octagon-5066.c	modified	+2	−2	View file
drivers/mtd/maps/pci.c	modified	+2	−2	View file
drivers/mtd/maps/pcmciamtd.c	modified	+2	−2	View file
drivers/mtd/maps/physmap.c	modified	+9	−25	View file
drivers/mtd/maps/physmap_of.c	modified	+4	−26	View file
drivers/mtd/maps/plat-ram.c	modified	+9	−15	View file
drivers/mtd/maps/pmcmsp-flash.c	modified	+3	−3	View file
drivers/mtd/maps/pxa2xx-flash.c	modified	+4	−14	View file
drivers/mtd/maps/rbtx4939-flash.c	modified	+5	−19	View file
drivers/mtd/maps/rpxlite.c	modified	+2	−2	View file
drivers/mtd/maps/sa1100-flash.c	modified	+6	−15	View file
drivers/mtd/maps/sbc_gxx.c	modified	+2	−2	View file
drivers/mtd/maps/sc520cdp.c	modified	+4	−4	View file
drivers/mtd/maps/scb2_flash.c	modified	+3	−3	View file
drivers/mtd/maps/scx200_docflash.c	modified	+3	−13	View file
drivers/mtd/maps/solutionengine.c	modified	+6	−6	View file
drivers/mtd/maps/sun_uflash.c	modified	+2	−2	View file
drivers/mtd/maps/tqm8xxl.c	modified	+5	−15	View file
drivers/mtd/maps/ts5500_flash.c	modified	+2	−2	View file
drivers/mtd/maps/tsunami_flash.c	modified	+2	−2	View file
drivers/mtd/maps/uclinux.c	modified	+2	−10	View file
drivers/mtd/maps/vmax301.c	modified	+2	−2	View file
drivers/mtd/maps/vmu-flash.c	modified	+2	−2	View file
drivers/mtd/maps/wr_sbc82xx_flash.c	modified	+9	−6	View file
drivers/mtd/mtd_blkdevs.c	modified	+21	−3	View file
drivers/mtd/mtdchar.c	modified	+23	−32	View file
drivers/mtd/mtdconcat.c	modified	+2	−2	View file
drivers/mtd/mtdcore.c	modified	+119	−48	View file
drivers/mtd/mtdcore.h	modified	+6	−0	View file
drivers/mtd/mtdpart.c	modified	+3	−6	View file
drivers/mtd/mtdswap.c	modified	+7	−1	View file
drivers/mtd/nand/Kconfig	modified	+2	−3	View file
drivers/mtd/nand/alauda.c	modified	+2	−2	View file
drivers/mtd/nand/ams-delta.c	modified	+2	−2	View file
drivers/mtd/nand/atmel_nand.c	modified	+2	−11	View file
drivers/mtd/nand/au1550nd.c	modified	+2	−1	View file
drivers/mtd/nand/autcpu12.c	modified	+8	−8	View file
drivers/mtd/nand/bcm_umi_nand.c	modified	+1	−3	View file
drivers/mtd/nand/bf5xx_nand.c	modified	+1	−6	View file
drivers/mtd/nand/cafe_nand.c	modified	+2	−9	View file
drivers/mtd/nand/cmx270_nand.c	modified	+1	−1	View file
drivers/mtd/nand/cs553x_nand.c	modified	+3	−16	View file
drivers/mtd/nand/davinci_nand.c	modified	+21	−30	View file
drivers/mtd/nand/denali.c	modified	+113	−134	View file
drivers/mtd/nand/denali.h	modified	+58	−315	View file
drivers/mtd/nand/diskonchip.c	modified	+7	−11	View file
drivers/mtd/nand/edb7312.c	modified	+1	−8	View file
drivers/mtd/nand/fsl_elbc_nand.c	modified	+1	−11	View file
drivers/mtd/nand/fsl_upm.c	modified	+1	−11	View file
drivers/mtd/nand/fsmc_nand.c	modified	+4	−21	View file
drivers/mtd/nand/gpio.c	modified	+2	−2	View file
drivers/mtd/nand/h1910.c	modified	+1	−4	View file
drivers/mtd/nand/jz4740_nand.c	modified	+1	−9	View file
drivers/mtd/nand/mpc5121_nfc.c	modified	+1	−11	View file
drivers/mtd/nand/mxc_nand.c	modified	+36	−28	View file
drivers/mtd/nand/nand_base.c	modified	+3	−15	View file
drivers/mtd/nand/nand_bbt.c	modified	+4	−23	View file
drivers/mtd/nand/nandsim.c	modified	+3	−1	View file
drivers/mtd/nand/ndfc.c	modified	+36	−29	View file
drivers/mtd/nand/nomadik_nand.c	modified	+1	−6	View file
drivers/mtd/nand/nuc900_nand.c	modified	+2	−2	View file
drivers/mtd/nand/omap2.c	modified	+16	−16	View file
drivers/mtd/nand/orion_nand.c	modified	+1	−13	View file
drivers/mtd/nand/pasemi_nand.c	modified	+1	−1	View file
drivers/mtd/nand/plat_nand.c	modified	+3	−9	View file
drivers/mtd/nand/ppchameleonevb.c	modified	+5	−10	View file
drivers/mtd/nand/pxa3xx_nand.c	modified	+3	−10	View file
drivers/mtd/nand/rtc_from4.c	modified	+2	−1	View file
drivers/mtd/nand/s3c2410.c	modified	+45	−30	View file
drivers/mtd/nand/sh_flctl.c	modified	+1	−1	View file
drivers/mtd/nand/sharpsl.c	modified	+2	−10	View file
drivers/mtd/nand/sm_common.c	modified	+1	−1	View file
drivers/mtd/nand/socrates_nand.c	modified	+1	−15	View file
drivers/mtd/nand/spia.c	modified	+1	−1	View file
drivers/mtd/nand/tmio_nand.c	modified	+1	−9	View file
drivers/mtd/nand/txx9ndfmc.c	modified	+1	−13	View file
drivers/mtd/onenand/Kconfig	modified	+0	−1	View file
drivers/mtd/onenand/generic.c	modified	+4	−12	View file
drivers/mtd/onenand/omap2.c	modified	+3	−7	View file
drivers/mtd/onenand/onenand_base.c	modified	+42	−12	View file
drivers/mtd/onenand/onenand_sim.c	modified	+2	−1	View file
drivers/mtd/onenand/samsung.c	modified	+3	−9	View file
drivers/mtd/ubi/gluebi.c	modified	+3	−3	View file
drivers/net/sfc/mtd.c	modified	+3	−3	View file
fs/jffs2/dir.c	modified	+0	−4	View file
fs/jffs2/scan.c	modified	+11	−8	View file
include/linux/mtd/mtd.h	modified	+7	−10	View file
include/linux/mtd/nand.h	modified	+2	−2	View file
include/linux/mtd/partitions.h	modified	+8	−8	View file
include/linux/mtd/physmap.h	modified	+0	−4	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 6f242d5..17910e2 100644
--- a/Documentation/DocBook/mtdnand.tmpl
+++ b/Documentation/DocBook/mtdnand.tmpl
@@ -189,8 +189,7 @@ static void __iomem *baseaddr;
 		<title>Partition defines</title>
 		<para>
 			If you want to divide your device into partitions, then
-			enable the configuration switch CONFIG_MTD_PARTITIONS and define
-			a partitioning scheme suitable to your board.
+			define a partitioning scheme suitable to your board.
 		</para>
 		<programlisting>
 #define NUM_PARTITIONS 2

arch/arm/mach-gemini/board-wbd111.c

View file

diff --git a/arch/arm/mach-gemini/board-wbd111.c b/arch/arm/mach-gemini/board-wbd111.c
index af7b68a..88cc422 100644
--- a/arch/arm/mach-gemini/board-wbd111.c
+++ b/arch/arm/mach-gemini/board-wbd111.c
@@ -84,7 +84,6 @@ static struct sys_timer wbd111_timer = {
 	.init	= gemini_timer_init,
 };
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition wbd111_partitions[] = {
 	{
 		.name		= "RedBoot",
@@ -116,11 +115,7 @@ static struct mtd_partition wbd111_partitions[] = {
 		.mask_flags	= MTD_WRITEABLE,
 	}
 };
-#define wbd111_num_partitions	ARRAY_SIZE(wbd111_partitions)
-#else
-#define wbd111_partitions	NULL
-#define wbd111_num_partitions	0
-#endif /* CONFIG_MTD_PARTITIONS */
+#define wbd111_num_partitions  ARRAY_SIZE(wbd111_partitions)
 
 static void __init wbd111_init(void)
 {

arch/arm/mach-gemini/board-wbd222.c

View file

diff --git a/arch/arm/mach-gemini/board-wbd222.c b/arch/arm/mach-gemini/board-wbd222.c
index 99e5bbe..3a22034 100644
--- a/arch/arm/mach-gemini/board-wbd222.c
+++ b/arch/arm/mach-gemini/board-wbd222.c
@@ -84,7 +84,6 @@ static struct sys_timer wbd222_timer = {
 	.init	= gemini_timer_init,
 };
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition wbd222_partitions[] = {
 	{
 		.name		= "RedBoot",
@@ -116,11 +115,7 @@ static struct mtd_partition wbd222_partitions[] = {
 		.mask_flags	= MTD_WRITEABLE,
 	}
 };
-#define wbd222_num_partitions	ARRAY_SIZE(wbd222_partitions)
-#else
-#define wbd222_partitions	NULL
-#define wbd222_num_partitions	0
-#endif /* CONFIG_MTD_PARTITIONS */
+#define wbd222_num_partitions  ARRAY_SIZE(wbd222_partitions)
 
 static void __init wbd222_init(void)
 {

arch/arm/mach-ixp4xx/ixdp425-setup.c

View file

diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index 1407833..dca4f7f 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -60,7 +60,6 @@ static struct platform_device ixdp425_flash = {
 #if defined(CONFIG_MTD_NAND_PLATFORM) || \
     defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
 
-#ifdef CONFIG_MTD_PARTITIONS
 const char *part_probes[] = { "cmdlinepart", NULL };
 
 static struct mtd_partition ixdp425_partitions[] = {
@@ -74,7 +73,6 @@ static struct mtd_partition ixdp425_partitions[] = {
 		.size	= MTDPART_SIZ_FULL
 	},
 };
-#endif
 
 static void
 ixdp425_flash_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
@@ -103,11 +101,9 @@ static struct platform_nand_data ixdp425_flash_nand_data = {
 		.nr_chips		= 1,
 		.chip_delay		= 30,
 		.options		= NAND_NO_AUTOINCR,
-#ifdef CONFIG_MTD_PARTITIONS
 		.part_probe_types 	= part_probes,
 		.partitions	 	= ixdp425_partitions,
 		.nr_partitions	 	= ARRAY_SIZE(ixdp425_partitions),
-#endif
 	},
 	.ctrl = {
 		.cmd_ctrl 		= ixdp425_flash_nand_cmd_ctrl

arch/arm/mach-pxa/Kconfig

View file

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 2fc9f94..cd19309 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -153,7 +153,6 @@ config MACH_XCEP
 	bool "Iskratel Electronics XCEP"
 	select PXA25x
 	select MTD
-	select MTD_PARTITIONS
 	select MTD_PHYSMAP
 	select MTD_CFI_INTELEXT
 	select MTD_CFI

arch/arm/mach-s3c2410/mach-amlm5900.c

View file

diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c
index 44440cb..dabc141 100644
--- a/arch/arm/mach-s3c2410/mach-amlm5900.c
+++ b/arch/arm/mach-s3c2410/mach-amlm5900.c
@@ -58,8 +58,6 @@
 #include <plat/cpu.h>
 #include <plat/gpio-cfg.h>
 
-#ifdef CONFIG_MTD_PARTITIONS
-
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/map.h>
@@ -113,7 +111,6 @@ static struct platform_device amlm5900_device_nor = {
 	.num_resources	= 1,
 	.resource	= &amlm5900_nor_resource,
 };
-#endif
 
 static struct map_desc amlm5900_iodesc[] __initdata = {
 };
@@ -158,9 +155,7 @@ static struct platform_device *amlm5900_devices[] __initdata = {
  	&s3c_device_rtc,
 	&s3c_device_usbgadget,
         &s3c_device_sdi,
-#ifdef CONFIG_MTD_PARTITIONS
 	&amlm5900_device_nor,
-#endif
 };
 
 static void __init amlm5900_map_io(void)

arch/arm/mach-s3c2410/mach-tct_hammer.c

View file

diff --git a/arch/arm/mach-s3c2410/mach-tct_hammer.c b/arch/arm/mach-s3c2410/mach-tct_hammer.c
index a15d062..43c2b83 100644
--- a/arch/arm/mach-s3c2410/mach-tct_hammer.c
+++ b/arch/arm/mach-s3c2410/mach-tct_hammer.c
@@ -49,8 +49,6 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 
-#ifdef CONFIG_MTD_PARTITIONS
-
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/map.h>
@@ -91,8 +89,6 @@ static struct platform_device tct_hammer_device_nor = {
 	.resource	= &tct_hammer_nor_resource,
 };
 
-#endif
-
 static struct map_desc tct_hammer_iodesc[] __initdata = {
 };
 
@@ -133,9 +129,7 @@ static struct platform_device *tct_hammer_devices[] __initdata = {
 	&s3c_device_rtc,
 	&s3c_device_usbgadget,
 	&s3c_device_sdi,
-#ifdef CONFIG_MTD_PARTITIONS
 	&tct_hammer_device_nor,
-#endif
 };
 
 static void __init tct_hammer_map_io(void)

arch/blackfin/mach-bf537/boards/stamp.c

View file

diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index e16dc45..76db1d4 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -382,7 +382,6 @@ static struct platform_device net2272_bfin_device = {
 #endif
 
 #if defined(CONFIG_MTD_NAND_PLATFORM) || defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
-#ifdef CONFIG_MTD_PARTITIONS
 const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL };
 
 static struct mtd_partition bfin_plat_nand_partitions[] = {
@@ -396,7 +395,6 @@ static struct mtd_partition bfin_plat_nand_partitions[] = {
 		.offset = MTDPART_OFS_APPEND,
 	},
 };
-#endif
 
 #define BFIN_NAND_PLAT_CLE 2
 #define BFIN_NAND_PLAT_ALE 1
@@ -423,11 +421,9 @@ static struct platform_nand_data bfin_plat_nand_data = {
 	.chip = {
 		.nr_chips = 1,
 		.chip_delay = 30,
-#ifdef CONFIG_MTD_PARTITIONS
 		.part_probe_types = part_probes,
 		.partitions = bfin_plat_nand_partitions,
 		.nr_partitions = ARRAY_SIZE(bfin_plat_nand_partitions),
-#endif
 	},
 	.ctrl = {
 		.cmd_ctrl  = bfin_plat_nand_cmd_ctrl,

arch/blackfin/mach-bf561/boards/acvilon.c

View file

diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c b/arch/blackfin/mach-bf561/boards/acvilon.c
index 3926cd9..9231a94 100644
--- a/arch/blackfin/mach-bf561/boards/acvilon.c
+++ b/arch/blackfin/mach-bf561/boards/acvilon.c
@@ -243,7 +243,6 @@ static struct platform_device bfin_uart0_device = {
 
 #if defined(CONFIG_MTD_NAND_PLATFORM) || defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
 
-#ifdef CONFIG_MTD_PARTITIONS
 const char *part_probes[] = { "cmdlinepart", NULL };
 
 static struct mtd_partition bfin_plat_nand_partitions[] = {
@@ -257,7 +256,6 @@ static struct mtd_partition bfin_plat_nand_partitions[] = {
 	     .offset = MTDPART_OFS_APPEND,
 	     },
 };
-#endif
 
 #define BFIN_NAND_PLAT_CLE 2
 #define BFIN_NAND_PLAT_ALE 3
@@ -286,11 +284,9 @@ static struct platform_nand_data bfin_plat_nand_data = {
 	.chip = {
 		 .nr_chips = 1,
 		 .chip_delay = 30,
-#ifdef CONFIG_MTD_PARTITIONS
 		 .part_probe_types = part_probes,
 		 .partitions = bfin_plat_nand_partitions,
 		 .nr_partitions = ARRAY_SIZE(bfin_plat_nand_partitions),
-#endif
 		 },
 	.ctrl = {
 		 .cmd_ctrl = bfin_plat_nand_cmd_ctrl,

arch/cris/Kconfig

View file

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index b6b94a2..17addac 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -270,7 +270,6 @@ config ETRAX_AXISFLASHMAP
 	select MTD_JEDECPROBE if ETRAX_ARCH_V32
 	select MTD_CHAR
 	select MTD_BLOCK
-	select MTD_PARTITIONS
 	select MTD_COMPLEX_MAPPINGS
 	help
 	  This option enables MTD mapping of flash devices.  Needed to use

arch/cris/arch-v10/drivers/axisflashmap.c

View file

diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c
index ed708e1..a4bbdfd 100644
--- a/arch/cris/arch-v10/drivers/axisflashmap.c
+++ b/arch/cris/arch-v10/drivers/axisflashmap.c
@@ -372,7 +372,7 @@ static int __init init_axis_flash(void)
 #ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE
 	if (mymtd) {
 		main_partition.size = mymtd->size;
-		err = add_mtd_partitions(mymtd, &main_partition, 1);
+		err = mtd_device_register(mymtd, &main_partition, 1);
 		if (err)
 			panic("axisflashmap: Could not initialize "
 			      "partition for whole main mtd device!\n");
@@ -382,10 +382,12 @@ static int __init init_axis_flash(void)
         if (mymtd) {
 		if (use_default_ptable) {
 			printk(KERN_INFO " Using default partition table.\n");
-			err = add_mtd_partitions(mymtd, axis_default_partitions,
-						 NUM_DEFAULT_PARTITIONS);
+			err = mtd_device_register(mymtd,
+						  axis_default_partitions,
+						  NUM_DEFAULT_PARTITIONS);
 		} else {
-			err = add_mtd_partitions(mymtd, axis_partitions, pidx);
+			err = mtd_device_register(mymtd, axis_partitions,
+						  pidx);
 		}
 
 		if (err)

arch/cris/arch-v32/drivers/Kconfig

View file

diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index 1633b12..41a2732 100644
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -405,7 +405,6 @@ config ETRAX_AXISFLASHMAP
 	select MTD_JEDECPROBE
 	select MTD_CHAR
 	select MTD_BLOCK
-	select MTD_PARTITIONS
 	select MTD_COMPLEX_MAPPINGS
 	help
 	  This option enables MTD mapping of flash devices.  Needed to use

arch/cris/arch-v32/drivers/axisflashmap.c

View file

diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c
index 7b155f8..a2bde37 100644
--- a/arch/cris/arch-v32/drivers/axisflashmap.c
+++ b/arch/cris/arch-v32/drivers/axisflashmap.c
@@ -561,7 +561,7 @@ static int __init init_axis_flash(void)
 #ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE
 	if (main_mtd) {
 		main_partition.size = main_mtd->size;
-		err = add_mtd_partitions(main_mtd, &main_partition, 1);
+		err = mtd_device_register(main_mtd, &main_partition, 1);
 		if (err)
 			panic("axisflashmap: Could not initialize "
 			      "partition for whole main mtd device!\n");
@@ -597,7 +597,8 @@ static int __init init_axis_flash(void)
 			mtd_ram->erasesize = (main_mtd ? main_mtd->erasesize :
 				CONFIG_ETRAX_PTABLE_SECTOR);
 		} else {
-			err = add_mtd_partitions(main_mtd, &partition[part], 1);
+			err = mtd_device_register(main_mtd, &partition[part],
+						  1);
 			if (err)
 				panic("axisflashmap: Could not add mtd "
 					"partition %d\n", part);
@@ -633,7 +634,7 @@ static int __init init_axis_flash(void)
 #ifndef CONFIG_ETRAX_VCS_SIM
 	if (aux_mtd) {
 		aux_partition.size = aux_mtd->size;
-		err = add_mtd_partitions(aux_mtd, &aux_partition, 1);
+		err = mtd_device_register(aux_mtd, &aux_partition, 1);
 		if (err)
 			panic("axisflashmap: Could not initialize "
 			      "aux mtd device!\n");

arch/mips/cavium-octeon/flash_setup.c

View file

diff --git a/arch/mips/cavium-octeon/flash_setup.c b/arch/mips/cavium-octeon/flash_setup.c
index 008f657..0ee02f5 100644
--- a/arch/mips/cavium-octeon/flash_setup.c
+++ b/arch/mips/cavium-octeon/flash_setup.c
@@ -16,7 +16,6 @@
 
 static struct map_info flash_map;
 static struct mtd_info *mymtd;
-#ifdef CONFIG_MTD_PARTITIONS
 static int nr_parts;
 static struct mtd_partition *parts;
 static const char *part_probe_types[] = {
@@ -26,7 +25,6 @@ static const char *part_probe_types[] = {
 #endif
 	NULL
 };
-#endif
 
 /**
  * Module/ driver initialization.
@@ -63,17 +61,10 @@ static int __init flash_init(void)
 		if (mymtd) {
 			mymtd->owner = THIS_MODULE;
 
-#ifdef CONFIG_MTD_PARTITIONS
 			nr_parts = parse_mtd_partitions(mymtd,
 							part_probe_types,
 							&parts, 0);
-			if (nr_parts > 0)
-				add_mtd_partitions(mymtd, parts, nr_parts);
-			else
-				add_mtd_device(mymtd);
-#else
-			add_mtd_device(mymtd);
-#endif
+			mtd_device_register(mymtd, parts, nr_parts);
 		} else {
 			pr_err("Failed to register MTD device for flash\n");
 		}

arch/mips/txx9/generic/setup.c

View file

diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index 812816c..ec38e00 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -639,7 +639,6 @@ void __init txx9_physmap_flash_init(int no, unsigned long addr,
 		.flags = IORESOURCE_MEM,
 	};
 	struct platform_device *pdev;
-#ifdef CONFIG_MTD_PARTITIONS
 	static struct mtd_partition parts[2];
 	struct physmap_flash_data pdata_part;
 
@@ -658,7 +657,7 @@ void __init txx9_physmap_flash_init(int no, unsigned long addr,
 		pdata_part.parts = parts;
 		pdata = &pdata_part;
 	}
-#endif
+
 	pdev = platform_device_alloc("physmap-flash", no);
 	if (!pdev ||
 	    platform_device_add_resources(pdev, &res, 1) ||

drivers/mtd/Kconfig

View file

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index bc50d5e..4be8373 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -33,20 +33,6 @@ config MTD_TESTS
 	  should normally be compiled as kernel modules. The modules perform
 	  various checks and verifications when loaded.
 
-config MTD_PARTITIONS
-	bool "MTD partitioning support"
-	help
-	  If you have a device which needs to divide its flash chip(s) up
-	  into multiple 'partitions', each of which appears to the user as
-	  a separate MTD device, you require this option to be enabled. If
-	  unsure, say 'Y'.
-
-	  Note, however, that you don't need this option for the DiskOnChip
-	  devices. Partitioning on NFTL 'devices' is a different - that's the
-	  'normal' form of partitioning used on a block device.
-
-if MTD_PARTITIONS
-
 config MTD_REDBOOT_PARTS
 	tristate "RedBoot partition table parsing"
 	---help---
@@ -99,7 +85,7 @@ endif # MTD_REDBOOT_PARTS
 
 config MTD_CMDLINE_PARTS
 	bool "Command line partition table parsing"
-	depends on MTD_PARTITIONS = "y" && MTD = "y"
+	depends on MTD = "y"
 	---help---
 	  Allow generic configuration of the MTD partition tables via the kernel
 	  command line. Multiple flash resources are supported for hardware where
@@ -163,8 +149,6 @@ config MTD_AR7_PARTS
 	---help---
 	  TI AR7 partitioning support
 
-endif # MTD_PARTITIONS
-
 comment "User Modules And Translation Layers"
 
 config MTD_CHAR

drivers/mtd/Makefile

View file

diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index d578095..39664c4 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -4,8 +4,7 @@
 
 # Core functionality.
 obj-$(CONFIG_MTD)		+= mtd.o
-mtd-y				:= mtdcore.o mtdsuper.o mtdconcat.o
-mtd-$(CONFIG_MTD_PARTITIONS)	+= mtdpart.o
+mtd-y				:= mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o
 mtd-$(CONFIG_MTD_OF_PARTS)	+= ofpart.o
 
 obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o

drivers/mtd/chips/cfi_cmdset_0001.c

View file

diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index 09cb7c8..e1e122f 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -812,12 +812,9 @@ static int chip_ready (struct map_info *map, struct flchip *chip, unsigned long 
 			        break;
 
 			if (time_after(jiffies, timeo)) {
-				/* Urgh. Resume and pretend we weren't here.  */
-				map_write(map, CMD(0xd0), adr);
-				/* Make sure we're in 'read status' mode if it had finished */
-				map_write(map, CMD(0x70), adr);
-				chip->state = FL_ERASING;
-				chip->oldstate = FL_READY;
+				/* Urgh. Resume and pretend we weren't here.
+				 * Make sure we're in 'read status' mode if it had finished */
+				put_chip(map, chip, adr);
 				printk(KERN_ERR "%s: Chip not ready after erase "
 				       "suspended: status = 0x%lx\n", map->name, status.x[0]);
 				return -EIO;
@@ -997,7 +994,6 @@ static void put_chip(struct map_info *map, struct flchip *chip, unsigned long ad
 
 	switch(chip->oldstate) {
 	case FL_ERASING:
-		chip->state = chip->oldstate;
 		/* What if one interleaved chip has finished and the
 		   other hasn't? The old code would leave the finished
 		   one in READY mode. That's bad, and caused -EROFS

drivers/mtd/chips/cfi_cmdset_0002.c

View file

diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 0b49266..23175ed 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -462,13 +462,14 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
 			cfi_fixup_major_minor(cfi, extp);
 
 			/*
-			 * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4
+			 * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4, 1.5
 			 * see: http://cs.ozerki.net/zap/pub/axim-x5/docs/cfi_r20.pdf, page 19 
 			 *      http://www.spansion.com/Support/AppNotes/cfi_100_20011201.pdf
 			 *      http://www.spansion.com/Support/Datasheets/s29ws-p_00_a12_e.pdf
+			 *      http://www.spansion.com/Support/Datasheets/S29GL_128S_01GS_00_02_e.pdf
 			 */
 			if (extp->MajorVersion != '1' ||
-			    (extp->MajorVersion == '1' && (extp->MinorVersion < '0' || extp->MinorVersion > '4'))) {
+			    (extp->MajorVersion == '1' && (extp->MinorVersion < '0' || extp->MinorVersion > '5'))) {
 				printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
 				       "version %c.%c (%#02x/%#02x).\n",
 				       extp->MajorVersion, extp->MinorVersion,
@@ -710,9 +711,7 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr
 				 * there was an error (so leave the erase
 				 * routine to recover from it) or we trying to
 				 * use the erase-in-progress sector. */
-				map_write(map, cfi->sector_erase_cmd, chip->in_progress_block_addr);
-				chip->state = FL_ERASING;
-				chip->oldstate = FL_READY;
+				put_chip(map, chip, adr);
 				printk(KERN_ERR "MTD %s(): chip not ready after erase suspend\n", __func__);
 				return -EIO;
 			}
@@ -762,7 +761,6 @@ static void put_chip(struct map_info *map, struct flchip *chip, unsigned long ad
 
 	switch(chip->oldstate) {
 	case FL_ERASING:
-		chip->state = chip->oldstate;
 		map_write(map, cfi->sector_erase_cmd, chip->in_progress_block_addr);
 		chip->oldstate = FL_READY;
 		chip->state = FL_ERASING;

drivers/mtd/chips/cfi_cmdset_0020.c

View file

diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
index ed56ad3..179814a 100644
--- a/drivers/mtd/chips/cfi_cmdset_0020.c
+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
@@ -296,6 +296,7 @@ static inline int do_read_onechip(struct map_info *map, struct flchip *chip, lof
 				/* make sure we're in 'read status' mode */
 				map_write(map, CMD(0x70), cmd_addr);
 				chip->state = FL_ERASING;
+				wake_up(&chip->wq);
 				mutex_unlock(&chip->mutex);
 				printk(KERN_ERR "Chip not ready after erase "
 				       "suspended: status = 0x%lx\n", status.x[0]);

drivers/mtd/devices/block2mtd.c

View file

diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index 97183c8..b78f231 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -294,7 +294,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)
 	dev->mtd.priv = dev;
 	dev->mtd.owner = THIS_MODULE;
 
-	if (add_mtd_device(&dev->mtd)) {
+	if (mtd_device_register(&dev->mtd, NULL, 0)) {
 		/* Device didn't get added, so free the entry */
 		goto devinit_err;
 	}
@@ -465,7 +465,7 @@ static void __devexit block2mtd_exit(void)
 	list_for_each_safe(pos, next, &blkmtd_device_list) {
 		struct block2mtd_dev *dev = list_entry(pos, typeof(*dev), list);
 		block2mtd_sync(&dev->mtd);
-		del_mtd_device(&dev->mtd);
+		mtd_device_unregister(&dev->mtd);
 		INFO("mtd%d: [%s] removed", dev->mtd.index,
 				dev->mtd.name + strlen("block2mtd: "));
 		list_del(&dev->list);

drivers/mtd/devices/doc2000.c

View file

diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
index 5bf5f46..f7fbf60 100644
--- a/drivers/mtd/devices/doc2000.c
+++ b/drivers/mtd/devices/doc2000.c
@@ -597,7 +597,7 @@ void DoC2k_init(struct mtd_info *mtd)
 		doc2klist = mtd;
 		mtd->size = this->totlen;
 		mtd->erasesize = this->erasesize;
-		add_mtd_device(mtd);
+		mtd_device_register(mtd, NULL, 0);
 		return;
 	}
 }
@@ -1185,7 +1185,7 @@ static void __exit cleanup_doc2000(void)
 		this = mtd->priv;
 		doc2klist = this->nextdoc;
 
-		del_mtd_device(mtd);
+		mtd_device_unregister(mtd);
 
 		iounmap(this->virtadr);
 		kfree(this->chips);

drivers/mtd/devices/doc2001.c

View file

diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
index 0990f78..241192f 100644
--- a/drivers/mtd/devices/doc2001.c
+++ b/drivers/mtd/devices/doc2001.c
@@ -376,7 +376,7 @@ void DoCMil_init(struct mtd_info *mtd)
 		this->nextdoc = docmillist;
 		docmillist = mtd;
 		mtd->size  = this->totlen;
-		add_mtd_device(mtd);
+		mtd_device_register(mtd, NULL, 0);
 		return;
 	}
 }
@@ -826,7 +826,7 @@ static void __exit cleanup_doc2001(void)
 		this = mtd->priv;
 		docmillist = this->nextdoc;
 
-		del_mtd_device(mtd);
+		mtd_device_unregister(mtd);
 
 		iounmap(this->virtadr);
 		kfree(this->chips);

drivers/mtd/devices/doc2001plus.c

View file

diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c
index 8b36fa7..09ae0ad 100644
--- a/drivers/mtd/devices/doc2001plus.c
+++ b/drivers/mtd/devices/doc2001plus.c
@@ -499,7 +499,7 @@ void DoCMilPlus_init(struct mtd_info *mtd)
 		docmilpluslist = mtd;
 		mtd->size  = this->totlen;
 		mtd->erasesize = this->erasesize;
-		add_mtd_device(mtd);
+		mtd_device_register(mtd, NULL, 0);
 		return;
 	}
 }
@@ -1091,7 +1091,7 @@ static void __exit cleanup_doc2001plus(void)
 		this = mtd->priv;
 		docmilpluslist = this->nextdoc;
 