Merge tag 'for-linus-20150623' of git://git.infradead.org/linux-mtd
Pull MTD updates from Brian Norris: "JFFS2: - fix a theoretical unbalanced locking issue; the lock handling was a bit unclean, but AFAICT, it didn't actually lead to real deadlocks NAND: - brcmnand driver: new driver supporting NAND controller found originally on Broadcom STB SoCs (BCM7xxx), but now also found on BCM63xxx, iProc (e.g., Cygnus, BCM5301x), BCM3xxx, and more - begin factoring out BBT code so it can be shared between traditional (parallel) NAND drivers and upcoming SPI NAND drivers (WIP) - add common DT-based init support, so nand_base can pick up some flash properties automatically, using established common NAND DT properties - mxc_nand: support 8-bit ECC - pxa3xx_nand: * fix build for ARM64 * use a jiffies-based timeout SPI NOR: - add a few new IDs - clear out some unnecessary entries - make sure SECT_4K flags are correct for all (?) entries Core: - fix mtd->usecount race conditions (BUG_ON()) - switch to modern PM ops Other: - CFI: save code space by de-inlining large functions - clean up some partition parser selection code across several drivers - various miscellaneous changes, mostly minor" * tag 'for-linus-20150623' of git://git.infradead.org/linux-mtd: (57 commits) mtd: docg3: Fix kasprintf() usage mtd: docg3: Don't leak docg3->bbt in error path mtd: nandsim: Fix kasprintf() usage mtd: cs553x_nand: Fix kasprintf() usage mtd: r852: Fix device_create_file() usage mtd: brcmnand: drop unnecessary initialization mtd: propagate error codes from add_mtd_device() mtd: diskonchip: remove two-phase partitioning / registration mtd: dc21285: use raw spinlock functions for nw_gpio_lock mtd: chips: fixup dependencies, to prevent build error mtd: cfi_cmdset_0002: Initialize datum before calling map_word_load_partial mtd: cfi: deinline large functions mtd: lantiq-flash: use default partition parsers mtd: plat_nand: use default partition probe mtd: nand: correct indentation within conditional mtd: remove incorrect file name mtd: blktrans: use better error code for unimplemented ioctl() mtd: maps: Spelling s/reseved/reserved/ mtd: blktrans: change blktrans_getgeo return value mtd: mxc_nand: generate nand_ecclayout for 8 bit ECC ...
Showing
- Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt 150 additions, 0 deletionsDocumentation/devicetree/bindings/mtd/brcm,brcmnand.txt
- MAINTAINERS 6 additions, 0 deletionsMAINTAINERS
- drivers/mtd/chips/Kconfig 1 addition, 0 deletionsdrivers/mtd/chips/Kconfig
- drivers/mtd/chips/cfi_cmdset_0002.c 1 addition, 1 deletiondrivers/mtd/chips/cfi_cmdset_0002.c
- drivers/mtd/chips/cfi_util.c 188 additions, 0 deletionsdrivers/mtd/chips/cfi_util.c
- drivers/mtd/devices/docg3.c 13 additions, 5 deletionsdrivers/mtd/devices/docg3.c
- drivers/mtd/devices/m25p80.c 24 additions, 36 deletionsdrivers/mtd/devices/m25p80.c
- drivers/mtd/devices/spear_smi.c 2 additions, 2 deletionsdrivers/mtd/devices/spear_smi.c
- drivers/mtd/maps/Kconfig 1 addition, 1 deletiondrivers/mtd/maps/Kconfig
- drivers/mtd/maps/amd76xrom.c 1 addition, 1 deletiondrivers/mtd/maps/amd76xrom.c
- drivers/mtd/maps/dc21285.c 2 additions, 2 deletionsdrivers/mtd/maps/dc21285.c
- drivers/mtd/maps/esb2rom.c 1 addition, 1 deletiondrivers/mtd/maps/esb2rom.c
- drivers/mtd/maps/ichxrom.c 1 addition, 1 deletiondrivers/mtd/maps/ichxrom.c
- drivers/mtd/maps/lantiq-flash.c 1 addition, 3 deletionsdrivers/mtd/maps/lantiq-flash.c
- drivers/mtd/maps/physmap_of.c 2 additions, 2 deletionsdrivers/mtd/maps/physmap_of.c
- drivers/mtd/mtd_blkdevs.c 6 additions, 1 deletiondrivers/mtd/mtd_blkdevs.c
- drivers/mtd/mtdcore.c 35 additions, 27 deletionsdrivers/mtd/mtdcore.c
- drivers/mtd/nand/Kconfig 9 additions, 1 deletiondrivers/mtd/nand/Kconfig
- drivers/mtd/nand/Makefile 1 addition, 0 deletionsdrivers/mtd/nand/Makefile
- drivers/mtd/nand/brcmnand/Makefile 6 additions, 0 deletionsdrivers/mtd/nand/brcmnand/Makefile
Please register or sign in to comment