From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 3 Mar 2013 00:33:54 +0000 (-0800)
Subject: Merge tag 'for-linus-20130301' of git://git.infradead.org/linux-mtd
X-Git-Tag: v3.9-rc1~18
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=48476df99894492a0f7239f2f3c9a2dde4ff38e2;p=karo-tx-linux.git

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

Pull MTD update from David Woodhouse:
 "Fairly unexciting MTD merge for 3.9:

   - misc clean-ups in the MTD command-line partitioning parser
     (cmdlinepart)
   - add flash locking support for STmicro chips serial flash chips, as
     well as for CFI command set 2 chips.
   - new driver for the ELM error correction HW module found in various
     TI chips, enable the OMAP NAND driver to use the ELM HW error
     correction
   - added number of new serial flash IDs
   - various fixes and improvements in the gpmi NAND driver
   - bcm47xx NAND driver improvements
   - make the mtdpart module actually removable"

* tag 'for-linus-20130301' of git://git.infradead.org/linux-mtd: (45 commits)
  mtd: map: BUG() in non handled cases
  mtd: bcm47xxnflash: use pr_fmt for module prefix in messages
  mtd: davinci_nand: Use managed resources
  mtd: mtd_torturetest can cause stack overflows
  mtd: physmap_of: Convert device allocation to managed devm_kzalloc()
  mtd: at91: atmel_nand: for PMECC, add code to check the ONFI parameter ECC requirement.
  mtd: atmel_nand: make pmecc-cap, pmecc-sector-size in dts is optional.
  mtd: atmel_nand: avoid to report an error when lookup table offset is 0.
  mtd: bcm47xxsflash: adjust names of bus-specific functions
  mtd: bcm47xxpart: improve probing of nvram partition
  mtd: bcm47xxpart: add support for other erase sizes
  mtd: bcm47xxnflash: register this as normal driver
  mtd: bcm47xxnflash: fix message
  mtd: bcm47xxsflash: register this as normal driver
  mtd: bcm47xxsflash: write number of written bytes
  mtd: gpmi: add sanity check for the ECC
  mtd: gpmi: set the Golois Field bit for mx6q's BCH
  mtd: devices: elm: Removes <xx> literals in elm DT node
  mtd: gpmi: fix a dereferencing freed memory error
  mtd: fix the wrong timeo for panic_nand_wait()
  ...
---

48476df99894492a0f7239f2f3c9a2dde4ff38e2
diff --cc drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
index 595de4012e71,37d5b8956694..b2ab373c9eef
--- a/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
+++ b/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
@@@ -14,11 -16,9 +16,9 @@@
  #include <linux/slab.h>
  #include <linux/bcma/bcma.h>
  
- #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