[GIT *] MTD pull for 3.8

David Woodhouse dwmw2 at infradead.org
Wed Dec 19 14:23:14 EST 2012


Linus, please pull from
	git://git.infradead.org/linux-mtd.git for-linus-20121219

 - Various cleanups especially in NAND tests
 - Add support for NAND flash on BCMA bus
 - DT support for sh_flctl and denali NAND drivers
 - Kill obsolete/superceded drivers (fortunet, nomadik_nand)
 - Fix JFFS2 locking bug in ENOMEM failure path
 - New SPI flash chips, as usual
 - Support writing in 'reliable mode' for DiskOnChip G4
 - Debugfs support in nandsim

There are merge conflicts in four files which are fairly simple to
resolve, so I've left it for you to merge.

Alexander Shiyan (2):
      mtd: gpio-nand: Ability to use driver for configurations without RDY-pin
      mtd: Drop FORTUNET support

Alexey Khoroshilov (1):
      jffs2: hold erase_completion_lock on exit

Anton Prins (1):
      mtd: physmap_of: error checking to prevent a NULL pointer dereference

Arnd Bergmann (3):
      mtd: diskonchip: don't warn about ARM architecture
      mtd: diskonchip: use inline functions for DocRead/DocWrite
      mtd: uninitialized variable warning in map.h

Artem Bityutskiy (1):
      mtd: fix a number of checkpatch complaints

Bastian Hecht (3):
      mtd: sh_flctl: Minor cleanups
      mtd: sh_flctl: Add DMA capabilty
      mtd: sh_flctl: Add device tree support

Bill Pemberton (5):
      mtd: remove use of __devexit_p
      mtd: remove use of __devinit
      mtd: remove use of __devinitdata
      mtd: remove use of __devinitconst
      mtd: remove use of __devexit

Brian Norris (2):
      mtd: fsl_elbc_nand: remove unnecessary badblock_pattern
      mtd: nand: typo in nand_id_has_period() comments

Christian Herzig (1):
      mtd: tests/read: initialize buffer for whole next page

Dan Carpenter (1):
      mtg: docg3: potential divide by zero in doc_write_oob()

Dinh Nguyen (2):
      mtd: denali: split the generic driver and PCI layer
      mtd: denali: add a DT driver

Ezequiel Garcia (3):
      mtd: mtd_blkdev: Use a different name for block_device_operations variable
      mtd: mtd_blkdevs: Replace request handler kthread with a workqueue
      mtd: nandsim: Introduce debugfs infrastructure

Harald Nordgard-Hansen (1):
      mtd: fix recovery after failed write-buffer operation in cfi_cmdset_0002.c

Huang Shijie (6):
      mtd: use the NAND_STATUS_FAIL to replace the hardcode
      mtd: gpmi: remove unneccessary header
      mtd: cmdlinepart: fix the overflow of big mtd partitions
      mtd: de-select the chip when it is not used
      mtd: remove the de-select chip code in nand_release_device()
      mtd: remove the "chip" parameter in nand_get_device()

Jean-Christophe PLAGNIOL-VILLARD (2):
      mtd: fsmc_nand: pass the ale and cmd resource via resource
      mtd: physmap_of: allow to specify the mtd name for retro compatiblity

Jonas Gorski (5):
      mtd: bcm63xxpart: remove unused variable
      mtd: bcm63xxpart: merge sparelen calculation
      mtd: bcm63xxpart: make fixed part length calculation more generic
      mtd: bcm63xxpart: move the last curpart++ to its correct place
      mtd: bcm63xxpart: use correct printk format for partitions

Josh Radel (1):
      mtd: ofpart: Replicate mtd cmdline "lk" option with device tree "lock" property

Josh Wu (1):
      mtd: at91: atmel_nand: return bit flips for the PMECC read_page()

Liming Wang (1):
      mtd: m25p80: modify info for Micron N25Q128

Linus Walleij (3):
      ARM: nomadik: switch over to using the FSMC driver
      mtd: delete nomadik_nand driver
      ARM: nomadik: fixup some FSMC merge problems

Lothar Waßmann (2):
      mtd: mxc_nand: fix unbalanced clk_disable() in error path
      mtd: mxc_nand: reorder part_probes to let cmdline override other sources

Luka Perkov (1):
      mtd: use SQUASHFS_MAGIC from uapi/linux/magic.h

Marek Vasut (1):
      mtd: m25p80: Make fast read configurable via DT

Masanari Iida (1):
      mtd: Fix typo mtd/tests

Matthew Leach (1):
      mtd: nand/gpio: use io{read,write}*_rep accessors

Matthieu CASTET (7):
      mtd: m25p80: add support for the windbond w25q256 chip
      mtdoops: don't erase flash at each boot
      mtd: nand_wait: warn if the nand is busy on exit
      mted: nand_wait_ready timeout fix
      mtd: nand: print flash size during detection
      mtd: nand: add NAND_BUSWIDTH_AUTO to autodetect bus width
      mtd: nand: onfi need to be probed in 8 bits mode

Mike Dunn (3):
      mtd: nand/docg4: add support for writing in reliable mode
      mtd: nand/docg4: reserve bb marker area in ecclayout
      mtd: nand/docg4: fix and improve read of factory bbt

Murali Karicheri (1):
      mtd: davinci: add support for parition binding nodes

Nathan Williams (1):
      mtd cs553x_nand: Initialise ecc.strength before nand_scan()

NeilBrown (1):
      mtd: block2mtd: throttle writes by calling balance_dirty_pages_ratelimited.

Prabhakar Kushwaha (1):
      mtd: fsl_ifc_nand: wait tWB time, poll R/B before command execution

Rafał Miłecki (9):
      bcma: export PLL reading function
      mtd: prepare place for BCMA NAND flash driver(s)
      mtd: bcm47xxnflash: init NAND on BCM4706
      mtd: bcm47xxnflash: support for NAND_CMD_READID command
      mtd: bcm47xxnflash: implement reading
      mtd: bcm47xxnflash: enable BCM4706 driver
      mtd: bcm47xxnflash: define some magic numbers
      mtd: bcm47xxnflash: support NAND_CMD_STATUS
      mtd: bcm47xxnflash: writing support

Robert P. J. Day (1):
      mtd: Fix kernel-doc content to avoid warning.

Sachin Kamat (2):
      mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions()
      mtd: s3c2410: Fix potential NULL pointer dereference error

Shmulik Ladkani (1):
      mtd: cmdlinepart: Simplify parse_cmdline_partitions

Srinivas Kandagatla (1):
      mtd: spear_smi: use module_platform_driver macro

Stephen Warren (1):
      mtd: m25p80: add support for the Winbond w25q80bl chip

Vikram Narayanan (10):
      mtd: gpmi-nand: make debug prints more clear
      mtd: tests: mtd_nandbiterrs: replace msg macro with pr_{info,err}
      mtd: tests: mtd_nandecctest: Use pr_fmt macro
      mtd: tests: mtd_pagetest: Replace printk with pr_{info,crit,err}
      mtd: tests: mtd_readtest: Replace printk with pr_{info,err}
      mtd: tests: mtd_stresstest: Replace printk with pr_{info,crit,err}
      mtd: tests: mtd_speedtest: Replace printk with pr_{info,crit,err}
      mtd: tests: mtd_subpagetest: replace printk with pr_{info,crit,err}
      mtd: tests: mtd_torturetest: Replace printk with pr_{info,crit}
      mtd: mtd_oobtest: printk -> pr_{info,err,crit}

Vipin Kumar (4):
      mtd: fsmc_nand: change the type for regs to void __iomem *
      mtd: fsmc_nand: modify the wait to uninterruptible
      mtd: fsmc_nand: use relaxed variants of io accessors
      mtd: nand: Increase the ecc placement locations to 640

Viresh Kumar (1):
      mtd: map: Fix compilation warning

Wolfram Sang (1):
      mtd: nand: gpmi: reset BCH earlier, too, to avoid NAND startup problems

 .../devicetree/bindings/arm/davinci/nand.txt       |   8 +
 .../devicetree/bindings/mtd/denali-nand.txt        |  23 ++
 .../devicetree/bindings/mtd/flctl-nand.txt         |  49 +++
 .../devicetree/bindings/mtd/fsmc-nand.txt          |  12 +-
 Documentation/devicetree/bindings/mtd/m25p80.txt   |  29 ++
 .../devicetree/bindings/mtd/mtd-physmap.txt        |   3 +
 arch/arm/boot/dts/spear13xx.dtsi                   |  10 +-
 arch/arm/boot/dts/spear300.dtsi                    |   8 +-
 arch/arm/boot/dts/spear310.dtsi                    |   8 +-
 arch/arm/boot/dts/spear320.dtsi                    |   8 +-
 arch/arm/boot/dts/spear600.dtsi                    |   8 +-
 arch/arm/configs/nhk8815_defconfig                 |   2 +-
 arch/arm/mach-nomadik/board-nhk8815.c              |  73 ++--
 arch/arm/mach-nomadik/include/mach/fsmc.h          |  29 --
 arch/arm/mach-u300/core.c                          |  14 +-
 drivers/bcma/driver_chipcommon_pmu.c               |   3 +-
 drivers/clk/clk-nomadik.c                          |   1 +
 drivers/mtd/ar7part.c                              |   7 +-
 drivers/mtd/bcm63xxpart.c                          |  32 +-
 drivers/mtd/chips/cfi_cmdset_0002.c                |  16 +-
 drivers/mtd/cmdlinepart.c                          |  91 ++---
 drivers/mtd/devices/bcm47xxsflash.c                |   4 +-
 drivers/mtd/devices/block2mtd.c                    |   4 +-
 drivers/mtd/devices/docg3.c                        |   2 +-
 drivers/mtd/devices/docprobe.c                     |   2 -
 drivers/mtd/devices/m25p80.c                       |  48 ++-
 drivers/mtd/devices/mtd_dataflash.c                |  14 +-
 drivers/mtd/devices/spear_smi.c                    |  23 +-
 drivers/mtd/devices/sst25l.c                       |  10 +-
 drivers/mtd/maps/Kconfig                           |   7 -
 drivers/mtd/maps/Makefile                          |   1 -
 drivers/mtd/maps/amd76xrom.c                       |   7 +-
 drivers/mtd/maps/autcpu12-nvram.c                  |   6 +-
 drivers/mtd/maps/bfin-async-flash.c                |   9 +-
 drivers/mtd/maps/ck804xrom.c                       |   6 +-
 drivers/mtd/maps/esb2rom.c                         |   6 +-
 drivers/mtd/maps/fortunet.c                        | 277 --------------
 drivers/mtd/maps/gpio-addr-flash.c                 |  12 +-
 drivers/mtd/maps/ichxrom.c                         |   8 +-
 drivers/mtd/maps/intel_vr_nor.c                    |  18 +-
 drivers/mtd/maps/lantiq-flash.c                    |   8 +-
 drivers/mtd/maps/latch-addr-flash.c                |   4 +-
 drivers/mtd/maps/pci.c                             |   6 +-
 drivers/mtd/maps/physmap_of.c                      |  19 +-
 drivers/mtd/maps/pismo.c                           |  18 +-
 drivers/mtd/maps/pxa2xx-flash.c                    |   6 +-
 drivers/mtd/maps/sa1100-flash.c                    |   6 +-
 drivers/mtd/maps/scb2_flash.c                      |   8 +-
 drivers/mtd/maps/sun_uflash.c                      |   6 +-
 drivers/mtd/maps/vmu-flash.c                       |  10 +-
 drivers/mtd/mtd_blkdevs.c                          |  51 +--
 drivers/mtd/mtdoops.c                              |  15 +-
 drivers/mtd/nand/Kconfig                           |  34 +-
 drivers/mtd/nand/Makefile                          |   4 +-
 drivers/mtd/nand/ams-delta.c                       |   6 +-
 drivers/mtd/nand/atmel_nand.c                      |  28 +-
 drivers/mtd/nand/au1550nd.c                        |   8 +-
 drivers/mtd/nand/bcm47xxnflash/Makefile            |   4 +
 drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h     |  22 ++
 drivers/mtd/nand/bcm47xxnflash/main.c              | 108 ++++++
 drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c       | 413 +++++++++++++++++++++
 drivers/mtd/nand/bf5xx_nand.c                      |   8 +-
 drivers/mtd/nand/cafe_nand.c                       |  12 +-
 drivers/mtd/nand/cs553x_nand.c                     |   3 +-
 drivers/mtd/nand/davinci_nand.c                    |  13 +-
 drivers/mtd/nand/denali.c                          | 162 ++------
 drivers/mtd/nand/denali.h                          |   5 +
 drivers/mtd/nand/denali_dt.c                       | 167 +++++++++
 drivers/mtd/nand/denali_pci.c                      | 144 +++++++
 drivers/mtd/nand/diskonchip.c                      |   2 -
 drivers/mtd/nand/docg4.c                           |  73 +++-
 drivers/mtd/nand/fsl_elbc_nand.c                   |  17 +-
 drivers/mtd/nand/fsl_ifc_nand.c                    |   6 +-
 drivers/mtd/nand/fsl_upm.c                         |   8 +-
 drivers/mtd/nand/fsmc_nand.c                       | 106 +++---
 drivers/mtd/nand/gpio.c                            |  34 +-
 drivers/mtd/nand/gpmi-nand/gpmi-lib.c              |  10 +-
 drivers/mtd/nand/gpmi-nand/gpmi-nand.c             |  41 +-
 drivers/mtd/nand/gpmi-nand/gpmi-nand.h             |   1 -
 drivers/mtd/nand/jz4740_nand.c                     |  14 +-
 drivers/mtd/nand/lpc32xx_mlc.c                     |   6 +-
 drivers/mtd/nand/lpc32xx_slc.c                     |   6 +-
 drivers/mtd/nand/mpc5121_nfc.c                     |   8 +-
 drivers/mtd/nand/mxc_nand.c                        |  12 +-
 drivers/mtd/nand/nand_base.c                       | 114 +++---
 drivers/mtd/nand/nandsim.c                         | 186 +++++++---
 drivers/mtd/nand/ndfc.c                            |   6 +-
 drivers/mtd/nand/nomadik_nand.c                    | 235 ------------
 drivers/mtd/nand/nuc900_nand.c                     |   6 +-
 drivers/mtd/nand/omap2.c                           |   2 +-
 drivers/mtd/nand/orion_nand.c                      |   4 +-
 drivers/mtd/nand/pasemi_nand.c                     |   4 +-
 drivers/mtd/nand/plat_nand.c                       |   6 +-
 drivers/mtd/nand/s3c2410.c                         |   7 +-
 drivers/mtd/nand/sh_flctl.c                        | 306 +++++++++++++--
 drivers/mtd/nand/sharpsl.c                         |   6 +-
 drivers/mtd/nand/socrates_nand.c                   |   6 +-
 drivers/mtd/ofpart.c                               |   7 +-
 drivers/mtd/onenand/generic.c                      |   6 +-
 drivers/mtd/onenand/omap2.c                        |   6 +-
 drivers/mtd/onenand/samsung.c                      |   4 +-
 drivers/mtd/tests/mtd_nandbiterrs.c                |  73 ++--
 drivers/mtd/tests/mtd_nandecctest.c                |   6 +-
 drivers/mtd/tests/mtd_oobtest.c                    | 171 +++++----
 drivers/mtd/tests/mtd_pagetest.c                   | 152 ++++----
 drivers/mtd/tests/mtd_readtest.c                   |  44 +--
 drivers/mtd/tests/mtd_speedtest.c                  |  88 ++---
 drivers/mtd/tests/mtd_stresstest.c                 |  44 +--
 drivers/mtd/tests/mtd_subpagetest.c                | 124 +++----
 drivers/mtd/tests/mtd_torturetest.c                |  73 ++--
 fs/jffs2/nodemgmt.c                                |   6 +-
 include/linux/bcma/bcma.h                          |   1 +
 include/linux/mtd/blktrans.h                       |   4 +-
 include/linux/mtd/doc2000.h                        |  22 +-
 include/linux/mtd/fsmc.h                           |   3 -
 include/linux/mtd/gpmi-nand.h                      |  68 ----
 include/linux/mtd/map.h                            |   4 +-
 include/linux/mtd/mtd.h                            |   2 +-
 include/linux/mtd/nand.h                           |  11 +-
 include/linux/mtd/sh_flctl.h                       |  14 +-
 include/linux/platform_data/mtd-nomadik-nand.h     |  16 -
 121 files changed, 2543 insertions(+), 1834 deletions(-)

-- 
dwmw2

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 6171 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-mtd/attachments/20121219/5177bac6/attachment.bin>


More information about the linux-mtd mailing list