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

Pull mtd updates from David Woodhouse:
 - factor out common code from MTD tests
 - nand-gpio cleanup and portability to non-ARM
 - m25p80 support for 4-byte addressing chips, other new chips
 - pxa3xx cleanup and support for new platforms
 - remove obsolete alauda, octagon-5066 drivers
 - erase/write support for bcm47xxsflash
 - improve detection of ECC requirements for NAND, controller setup
 - NFC acceleration support for atmel-nand, read/write via SRAM
 - etc

* tag 'for-linus-20130909' of git://git.infradead.org/linux-mtd: (184 commits)
  mtd: chips: Add support for PMC SPI Flash chips in m25p80.c
  mtd: ofpart: use for_each_child_of_node() macro
  mtd: mtdswap: replace strict_strtoul() with kstrtoul()
  mtd cs553x_nand: use kzalloc() instead of memset
  mtd: atmel_nand: fix error return code in atmel_nand_probe()
  mtd: bcm47xxsflash: writing support
  mtd: bcm47xxsflash: implement erasing support
  mtd: bcm47xxsflash: convert to module_platform_driver instead of init/exit
  mtd: bcm47xxsflash: convert kzalloc to avoid invalid access
  mtd: remove alauda driver
  mtd: nand: mxc_nand: mark 'const' properly
  mtd: maps: cfi_flagadm: add missing __iomem annotation
  mtd: spear_smi: add missing __iomem annotation
  mtd: r852: Staticize local symbols
  mtd: nandsim: Staticize local symbols
  mtd: impa7: add missing __iomem annotation
  mtd: sm_ftl: Staticize local symbols
  mtd: m25p80: add support for mr25h10
  mtd: m25p80: make CONFIG_M25PXX_USE_FAST_READ safe to enable
  mtd: m25p80: Pass flags through CAT25_INFO macro
  ...

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
index c443f527a53a..7c0b27d132b1 100644
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
@@ -120,7 +120,7 @@
 #define PM49FL008       0x006A
 
 /* Sharp */
-#define LH28F640BF      0x00b0
+#define LH28F640BF      0x00B0
 
 /* ST - www.st.com */
 #define M29F800AB       0x0058
@@ -1299,13 +1299,14 @@ static const struct amd_flash_info jedec_table[] = {
                 .mfr_id         = CFI_MFR_SHARP,
                 .dev_id         = LH28F640BF,
                 .name           = "LH28F640BF",
-                .devtypes       = CFI_DEVICETYPE_X8,
+                .devtypes       = CFI_DEVICETYPE_X16,
                 .uaddr          = MTD_UADDR_UNNECESSARY,
-                .dev_size       = SIZE_4MiB,
-                .cmd_set        = P_ID_INTEL_STD,
-                .nr_regions     = 1,
+                .dev_size       = SIZE_8MiB,
+                .cmd_set        = P_ID_INTEL_EXT,
+                .nr_regions     = 2,
                 .regions        = {
-                        ERASEINFO(0x40000,16),
+                        ERASEINFO(0x10000, 127),
+                        ERASEINFO(0x02000, 8),
                 }
         }, {
                 .mfr_id         = CFI_MFR_SST,