Commit a17d4730 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus-1' of git://git.infradead.org/mtd-2.6 

* 'for-linus-1' of git://git.infradead.org/mtd-2.6: (49 commits)
  mtd: mtdswap: fix compilation warning
  mtdswap: kill strict error handling option
  mtd: nand: enable software BCH ECC in nand simulator
  mtd: nand: add software BCH ECC support
  mtd: fix printf format warnings, mostly lack of %zd for size_t, in mtdswap
  mtd: sm_rtl: check kmalloc return value
  mtd: cfi: add support for AMIC flashes (e.g. A29L160AT)
  lib: add shared BCH ECC library
  mtd: mxc_nand: fix OOB corruption when page size > 2KiB
  mtd: DaVinci: Removed header file that is not required
  mtd: pxa3xx_nand: clean the keep configure code
  mtd: pxa3xx_nand: mtd scan id process could be defined by driver itself
  mtd: pxa3xx_nand: unify prepare command
  mtd: pxa3xx_nand: discard wait_for_event,write_cmd,__readid function
  mtd: pxa3xx_nand: rework irq logic
  mtd: pxa3xx_nand: make scan procedure more clear
  mtd: speedtest: fix integer overflow
  mtd: mxc_nand: fix read past buffer end
  mtd: omap3: nand: report corrected ecc errors
  jffs2: remove a trailing white space in commentaries
  ...
parents 04a6553f 7bf7e370

arch/arm/plat-omap/include/plat/onenand.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ struct omap_onenand_platform_data { 
	int			dma_channel;

	u8			flags;

	u8			regulator_can_sleep;

	u8			skip_initial_unlocking;

};



#define ONENAND_MAX_PARTITIONS 8

arch/arm/plat-pxa/include/plat/pxa3xx_nand.h

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ struct pxa3xx_nand_cmdset { 
};



struct pxa3xx_nand_flash {

	char		*name;

	uint32_t	chip_id;

	unsigned int	page_per_block; /* Pages per block (PG_PER_BLK) */

	unsigned int	page_size;	/* Page size in bytes (PAGE_SZ) */
@@ -37,7 +38,6 @@ struct pxa3xx_nand_flash { 
	unsigned int	dfc_width;	/* Width of flash controller(DWIDTH_C) */

	unsigned int	num_blocks;	/* Number of physical blocks in Flash */



	struct pxa3xx_nand_cmdset *cmdset;	/* NAND command set */

	struct pxa3xx_nand_timing *timing;	/* NAND Flash timing */

};

arch/cris/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -276,7 +276,6 @@ config ETRAX_AXISFLASHMAP 
	select MTD_CHAR

	select MTD_BLOCK

	select MTD_PARTITIONS

	select MTD_CONCAT

	select MTD_COMPLEX_MAPPINGS

	help

	  This option enables MTD mapping of flash devices.  Needed to use

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

+0 −6
Original line number Diff line number Diff line
@@ -234,7 +234,6 @@ static struct mtd_info *flash_probe(void) 
	}



	if (mtd_cse0 && mtd_cse1) {

#ifdef CONFIG_MTD_CONCAT

		struct mtd_info *mtds[] = { mtd_cse0, mtd_cse1 };



		/* Since the concatenation layer adds a small overhead we
@@ -246,11 +245,6 @@ static struct mtd_info *flash_probe(void) 
		 */

		mtd_cse = mtd_concat_create(mtds, ARRAY_SIZE(mtds),

					    "cse0+cse1");

#else

		printk(KERN_ERR "%s and %s: Cannot concatenate due to kernel "

		       "(mis)configuration!\n", map_cse0.name, map_cse1.name);

		mtd_cse = NULL;

#endif

		if (!mtd_cse) {

			printk(KERN_ERR "%s and %s: Concatenation failed!\n",

			       map_cse0.name, map_cse1.name);

arch/cris/arch-v32/drivers/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -406,7 +406,6 @@ config ETRAX_AXISFLASHMAP 
	select MTD_CHAR

	select MTD_BLOCK

	select MTD_PARTITIONS

	select MTD_CONCAT

	select MTD_COMPLEX_MAPPINGS

	help

	  This option enables MTD mapping of flash devices.  Needed to use

CRA Git | Maintained and supported by SUSTech CRA and CCSE