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

Commit 9ee08c2d 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: (57 commits)
  [MTD] [NAND] subpage read feature as a way to increase performance. 
  CPUFREQ: S3C24XX NAND driver frequency scaling support.
  [MTD][NAND] au1550nd: remove unused variable
  [MTD] jedec_probe: Fix SST 16-bit chip detection
  [MTD][MTDPART] Fix a division by zero bug
  [MTD][MTDPART] Cleanup and document the erase region handling
  [MTD][MTDPART] Handle most checkpatch findings
  [MTD][MTDPART] Seperate main loop from per-partition code in add_mtd_partition
  [MTD] physmap: resume already suspended chips on failure to suspend
  [MTD] physmap: Fix suspend/resume/shutdown bugs.
  [MTD] [NOR] Fix -ETIMEO errors in CFI driver
  [MTD] [NAND] fsl_elbc_nand: fix section mismatch with CONFIG_MTD_OF_PARTS=y
  [JFFS2] Use .unlocked_ioctl
  [MTD] Fix const assignment in the MTD command line partitioning driver
  [MTD] [NOR] gen_probe: No debug message when debugging is disabled
  [MTD] [NAND] remove __PPC__ hardcoded address from DiskOnChip drivers
  [MTD] [MAPS] Remove the bast-flash driver.
  [MTD] [NAND] fsl_elbc_nand: ecclayout cleanups
  [MTD] [NAND] fsl_elbc_nand: implement support for flash-based BBT
  [MTD] [NAND] fsl_elbc_nand: fix OOB workability for large page NAND chips
  ...
parents eaf0ba5e 3d459559

arch/arm/mach-at91/at91cap9_devices.c

+4 −4
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {} 
 * -------------------------------------------------------------------- */



#if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)

static struct at91_nand_data nand_data;

static struct atmel_nand_data nand_data;



#define NAND_BASE	AT91_CHIPSELECT_3
@@ -395,7 +395,7 @@ static struct resource nand_resources[] = { 
};



static struct platform_device at91cap9_nand_device = {

	.name		= "at91_nand",

	.name		= "atmel_nand",

	.id		= -1,

	.dev		= {

				.platform_data	= &nand_data,
@@ -404,7 +404,7 @@ static struct platform_device at91cap9_nand_device = { 
	.num_resources	= ARRAY_SIZE(nand_resources),

};



void __init at91_add_device_nand(struct at91_nand_data *data)

void __init at91_add_device_nand(struct atmel_nand_data *data)

{

	unsigned long csa, mode;
@@ -445,7 +445,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data) 
	platform_device_register(&at91cap9_nand_device);

}

#else

void __init at91_add_device_nand(struct at91_nand_data *data) {}

void __init at91_add_device_nand(struct atmel_nand_data *data) {}

#endif

arch/arm/mach-at91/at91rm9200_devices.c

+4 −4
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {} 
 * -------------------------------------------------------------------- */



#if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)

static struct at91_nand_data nand_data;

static struct atmel_nand_data nand_data;



#define NAND_BASE	AT91_CHIPSELECT_3
@@ -382,7 +382,7 @@ static struct resource nand_resources[] = { 
};



static struct platform_device at91rm9200_nand_device = {

	.name		= "at91_nand",

	.name		= "atmel_nand",

	.id		= -1,

	.dev		= {

				.platform_data	= &nand_data,
@@ -391,7 +391,7 @@ static struct platform_device at91rm9200_nand_device = { 
	.num_resources	= ARRAY_SIZE(nand_resources),

};



void __init at91_add_device_nand(struct at91_nand_data *data)

void __init at91_add_device_nand(struct atmel_nand_data *data)

{

	unsigned int csa;
@@ -429,7 +429,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data) 
	platform_device_register(&at91rm9200_nand_device);

}

#else

void __init at91_add_device_nand(struct at91_nand_data *data) {}

void __init at91_add_device_nand(struct atmel_nand_data *data) {}

#endif

arch/arm/mach-at91/at91sam9260_devices.c

+4 −4
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {} 
 * -------------------------------------------------------------------- */



#if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)

static struct at91_nand_data nand_data;

static struct atmel_nand_data nand_data;



#define NAND_BASE	AT91_CHIPSELECT_3
@@ -302,7 +302,7 @@ static struct resource nand_resources[] = { 
};



static struct platform_device at91sam9260_nand_device = {

	.name		= "at91_nand",

	.name		= "atmel_nand",

	.id		= -1,

	.dev		= {

				.platform_data	= &nand_data,
@@ -311,7 +311,7 @@ static struct platform_device at91sam9260_nand_device = { 
	.num_resources	= ARRAY_SIZE(nand_resources),

};



void __init at91_add_device_nand(struct at91_nand_data *data)

void __init at91_add_device_nand(struct atmel_nand_data *data)

{

	unsigned long csa, mode;
@@ -373,7 +373,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data) 
	platform_device_register(&at91sam9260_nand_device);

}

#else

void __init at91_add_device_nand(struct at91_nand_data *data) {}

void __init at91_add_device_nand(struct atmel_nand_data *data) {}

#endif

arch/arm/mach-at91/at91sam9261_devices.c

+6 −6
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {} 
 * -------------------------------------------------------------------- */



#if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)

static struct at91_nand_data nand_data;

static struct atmel_nand_data nand_data;



#define NAND_BASE	AT91_CHIPSELECT_3
@@ -211,8 +211,8 @@ static struct resource nand_resources[] = { 
	}

};



static struct platform_device at91_nand_device = {

	.name		= "at91_nand",

static struct platform_device atmel_nand_device = {

	.name		= "atmel_nand",

	.id		= -1,

	.dev		= {

				.platform_data	= &nand_data,
@@ -221,7 +221,7 @@ static struct platform_device at91_nand_device = { 
	.num_resources	= ARRAY_SIZE(nand_resources),

};



void __init at91_add_device_nand(struct at91_nand_data *data)

void __init at91_add_device_nand(struct atmel_nand_data *data)

{

	unsigned long csa, mode;
@@ -262,11 +262,11 @@ void __init at91_add_device_nand(struct at91_nand_data *data) 
	at91_set_A_periph(AT91_PIN_PC1, 0);		/* NANDWE */



	nand_data = *data;

	platform_device_register(&at91_nand_device);

	platform_device_register(&atmel_nand_device);

}



#else

void __init at91_add_device_nand(struct at91_nand_data *data) {}

void __init at91_add_device_nand(struct atmel_nand_data *data) {}

#endif

arch/arm/mach-at91/at91sam9263_devices.c

+4 −4
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {} 
 * -------------------------------------------------------------------- */



#if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)

static struct at91_nand_data nand_data;

static struct atmel_nand_data nand_data;



#define NAND_BASE	AT91_CHIPSELECT_3
@@ -371,7 +371,7 @@ static struct resource nand_resources[] = { 
};



static struct platform_device at91sam9263_nand_device = {

	.name		= "at91_nand",

	.name		= "atmel_nand",

	.id		= -1,

	.dev		= {

				.platform_data	= &nand_data,
@@ -380,7 +380,7 @@ static struct platform_device at91sam9263_nand_device = { 
	.num_resources	= ARRAY_SIZE(nand_resources),

};



void __init at91_add_device_nand(struct at91_nand_data *data)

void __init at91_add_device_nand(struct atmel_nand_data *data)

{

	unsigned long csa, mode;
@@ -421,7 +421,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data) 
	platform_device_register(&at91sam9263_nand_device);

}

#else

void __init at91_add_device_nand(struct at91_nand_data *data) {}

void __init at91_add_device_nand(struct atmel_nand_data *data) {}

#endif