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

Commit 60f82910 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by David Woodhouse
Browse files

arm: Use the plat_nand default partition parser 



Use the default partition parser, cmdlinepart, provided by the plat_nand driver.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarAlexander Clouter <alex@digriz.org.uk>
Acked-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent f2e5a244

arch/arm/mach-ep93xx/snappercl15.c

+0 −3
Original line number Diff line number Diff line
@@ -82,8 +82,6 @@ static int snappercl15_nand_dev_ready(struct mtd_info *mtd) 
	return !!(__raw_readw(NAND_CTRL_ADDR(chip)) & SNAPPERCL15_NAND_RDY);

}



static const char *snappercl15_nand_part_probes[] = {"cmdlinepart", NULL};



static struct mtd_partition snappercl15_nand_parts[] = {

	{

		.name		= "Kernel",
@@ -100,7 +98,6 @@ static struct mtd_partition snappercl15_nand_parts[] = { 
static struct platform_nand_data snappercl15_nand_data = {

	.chip = {

		.nr_chips		= 1,

		.part_probe_types	= snappercl15_nand_part_probes,

		.partitions		= snappercl15_nand_parts,

		.nr_partitions		= ARRAY_SIZE(snappercl15_nand_parts),

		.options		= NAND_NO_AUTOINCR,

arch/arm/mach-ep93xx/ts72xx.c

+0 −3
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ static int ts72xx_nand_device_ready(struct mtd_info *mtd) 
	return !!(__raw_readb(addr) & 0x20);

}



static const char *ts72xx_nand_part_probes[] = { "cmdlinepart", NULL };



#define TS72XX_BOOTROM_PART_SIZE	(SZ_16K)

#define TS72XX_REDBOOT_PART_SIZE	(SZ_2M + SZ_1M)
@@ -134,7 +132,6 @@ static struct platform_nand_data ts72xx_nand_data = { 
		.nr_chips	= 1,

		.chip_offset	= 0,

		.chip_delay	= 15,

		.part_probe_types = ts72xx_nand_part_probes,

		.partitions	= ts72xx_nand_parts,

		.nr_partitions	= ARRAY_SIZE(ts72xx_nand_parts),

	},

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

+0 −3
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ static struct platform_device ixdp425_flash = { 
#if defined(CONFIG_MTD_NAND_PLATFORM) || \

    defined(CONFIG_MTD_NAND_PLATFORM_MODULE)



const char *part_probes[] = { "cmdlinepart", NULL };



static struct mtd_partition ixdp425_partitions[] = {

	{

		.name	= "ixp400 NAND FS 0",
@@ -101,7 +99,6 @@ static struct platform_nand_data ixdp425_flash_nand_data = { 
		.nr_chips		= 1,

		.chip_delay		= 30,

		.options		= NAND_NO_AUTOINCR,

		.part_probe_types 	= part_probes,

		.partitions	 	= ixdp425_partitions,

		.nr_partitions	 	= ARRAY_SIZE(ixdp425_partitions),

	},

arch/arm/mach-omap1/board-fsample.c

+0 −3
Original line number Diff line number Diff line
@@ -206,14 +206,11 @@ static int nand_dev_ready(struct mtd_info *mtd) 
	return gpio_get_value(FSAMPLE_NAND_RB_GPIO_PIN);

}



static const char *part_probes[] = { "cmdlinepart", NULL };



static struct platform_nand_data nand_data = {

	.chip	= {

		.nr_chips		= 1,

		.chip_offset		= 0,

		.options		= NAND_SAMSUNG_LP_OPTIONS,

		.part_probe_types	= part_probes,

	},

	.ctrl	= {

		.cmd_ctrl	= nand_cmd_ctl,

arch/arm/mach-omap1/board-h2.c

+0 −3
Original line number Diff line number Diff line
@@ -200,8 +200,6 @@ static int h2_nand_dev_ready(struct mtd_info *mtd) 
	return gpio_get_value(H2_NAND_RB_GPIO_PIN);

}



static const char *h2_part_probes[] = { "cmdlinepart", NULL };



static struct platform_nand_data h2_nand_platdata = {

	.chip	= {

		.nr_chips		= 1,
@@ -209,7 +207,6 @@ static struct platform_nand_data h2_nand_platdata = { 
		.nr_partitions		= ARRAY_SIZE(h2_nand_partitions),

		.partitions		= h2_nand_partitions,

		.options		= NAND_SAMSUNG_LP_OPTIONS,

		.part_probe_types	= h2_part_probes,

	},

	.ctrl	= {

		.cmd_ctrl	= h2_nand_cmd_ctl,