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

Commit 7355a5a6 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:
  mtd/nand_ids: Fix buswidth
  mtd/m25p80: fix test for end of loop
  mtd/m25p80: retlen is never NULL
  MIPS: Fix gen_nand probe structures contents
  gen_nand: Test if nr_chips field is valid
  BFIN: Fix gen_nand probe structures contents
  nand/denali: move all hardware initialization work to denali_hw_init
  nand/denali: Add a page check in denali_read_page & denali_read_page_raw
  nand/denali: use cpu_relax() while waiting for hardware interrupt
  nand/denali: change read_status function method
  nand/denali: Fixed check patch warnings
  ARM: Fix gen_nand probe structures contents
  mtd/nand_base: fix kernel-doc warnings & typos
  nand/denali: use dev_xx debug function to replace nand_dbg_print and some printk
  nand/denali: Fixed handle ECC error bugs
  nand/denali: use iowrite32() to replace denali_write32()
  nand/denali: Fixed probe function bugs
parents 7a1b29a8 84c4f46d

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

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ ixdp425_flash_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) 


static struct platform_nand_data ixdp425_flash_nand_data = {

	.chip = {

		.nr_chips		= 1,

		.chip_delay		= 30,

		.options		= NAND_NO_AUTOINCR,

#ifdef CONFIG_MTD_PARTITIONS

arch/arm/mach-mx3/mach-qong.c

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ static void qong_nand_select_chip(struct mtd_info *mtd, int chip) 


static struct platform_nand_data qong_nand_data = {

	.chip = {

		.nr_chips		= 1,

		.chip_delay		= 20,

		.options		= 0,

	},

arch/arm/mach-orion5x/ts78xx-setup.c

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ static struct mtd_partition ts78xx_ts_nand_parts[] = { 


static struct platform_nand_data ts78xx_ts_nand_data = {

	.chip	= {

		.nr_chips		= 1,

		.part_probe_types	= ts_nand_part_probes,

		.partitions		= ts78xx_ts_nand_parts,

		.nr_partitions		= ARRAY_SIZE(ts78xx_ts_nand_parts),

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

+1 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ static int bfin_plat_nand_dev_ready(struct mtd_info *mtd) 


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,

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

+1 −0
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ static int bfin_plat_nand_dev_ready(struct mtd_info *mtd) 


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,