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

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

Merge tag 'for-linus-20130204' of git://git.infradead.org/linux-mtd 

Pull MTD fixes from David Woodhouse:
 "A small set of simple regression and build fixes for 3.8:
   - Fix a warning introduced in ONFI NAND probe
   - Fix commandline partition parsing
   - Require BITREVERSE for DiskOnChip G3 driver
   - Fix build failure for davinci_nand as module
   - Bump NFLASH_READY_RETRIES for bcm47xxnflash"

* tag 'for-linus-20130204' of git://git.infradead.org/linux-mtd:
  mtd: nand: onfi don't WARN if we are in 16 bits mode
  mtd: physmap_of: fix cmdline partition method w/o linux, mtd-name
  mtd: docg3 fix missing bitreverse lib
  mtd: davinci_nand: fix modular build with CONFIG_OF=y
  mtd: bcm47xxnflash: increase NFLASH_READY_RETRIES
parents 6edacf05 0ce82b7f

drivers/mtd/devices/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ config MTD_DOCG3 
	tristate "M-Systems Disk-On-Chip G3"

	select BCH

	select BCH_CONST_PARAMS

	select BITREVERSE

	---help---

	  This provides an MTD device driver for the M-Systems DiskOnChip

	  G3 devices.

drivers/mtd/maps/physmap_of.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static int of_flash_probe(struct platform_device *dev) 
	resource_size_t res_size;

	struct mtd_part_parser_data ppdata;

	bool map_indirect;

	const char *mtd_name;

	const char *mtd_name = NULL;



	match = of_match_device(of_flash_match, &dev->dev);

	if (!match)

drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
#include "bcm47xxnflash.h"



/* Broadcom uses 1'000'000 but it seems to be too many. Tests on WNDR4500 has

 * shown 164 retries as maxiumum. */

#define NFLASH_READY_RETRIES		1000

 * shown ~1000 retries as maxiumum. */

#define NFLASH_READY_RETRIES		10000



#define NFLASH_SECTOR_SIZE		512

drivers/mtd/nand/davinci_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ static struct nand_ecclayout hwecc4_2048 __initconst = { 
static const struct of_device_id davinci_nand_of_match[] = {

	{.compatible = "ti,davinci-nand", },

	{},

}

};

MODULE_DEVICE_TABLE(of, davinci_nand_of_match);



static struct davinci_nand_pdata

drivers/mtd/nand/nand_base.c

+5 −2
Original line number Diff line number Diff line
@@ -2857,8 +2857,11 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip, 
	int i;

	int val;



	/* ONFI need to be probed in 8 bits mode */

	WARN_ON(chip->options & NAND_BUSWIDTH_16);

	/* ONFI need to be probed in 8 bits mode, and 16 bits should be selected with NAND_BUSWIDTH_AUTO */

	if (chip->options & NAND_BUSWIDTH_16) {

		pr_err("Trying ONFI probe in 16 bits mode, aborting !\n");

		return 0;

	}

	/* Try ONFI for unknown chip or LP */

	chip->cmdfunc(mtd, NAND_CMD_READID, 0x20, -1);

	if (chip->read_byte(mtd) != 'O' || chip->read_byte(mtd) != 'N' ||