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

Commit 29a6ccca 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: (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
parents 42604831 6a8a98b2

Documentation/DocBook/mtdnand.tmpl

+1 −2
Original line number Diff line number Diff line
@@ -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

+1 −6
Original line number Diff line number Diff line
@@ -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",
@@ -117,10 +116,6 @@ static struct mtd_partition wbd111_partitions[] = { 
	}

};

#define wbd111_num_partitions  ARRAY_SIZE(wbd111_partitions)

#else

#define wbd111_partitions	NULL

#define wbd111_num_partitions	0

#endif /* CONFIG_MTD_PARTITIONS */



static void __init wbd111_init(void)

{

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

+1 −6
Original line number Diff line number Diff line
@@ -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",
@@ -117,10 +116,6 @@ static struct mtd_partition wbd222_partitions[] = { 
	}

};

#define wbd222_num_partitions  ARRAY_SIZE(wbd222_partitions)

#else

#define wbd222_partitions	NULL

#define wbd222_num_partitions	0

#endif /* CONFIG_MTD_PARTITIONS */



static void __init wbd222_init(void)

{

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

+0 −4
Original line number Diff line number Diff line
@@ -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

+0 −1
Original line number Diff line number Diff line
@@ -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