Merge tag 'for-linus-20141015' of git://git.infradead.org/linux-mtd
Pull MTD update from Brian Norris: "Sorry for delaying this a bit later than usual. There's one mild regression from 3.16 that was noticed during the 3.17 cycle, and I meant to send a fix for it along with this pull request. I'll probably try to queue it up for a later pull request once I've had a better look at it, hopefully by -rc2 at the latest. Summary for this pull: NAND - Cleanup for Denali driver - Atmel: add support for new page sizes - Atmel: fix up 'raw' mode support - Atmel: miscellaneous cleanups - New timing mode helpers for non-ONFI NAND - OMAP: allow driver to be (properly) built as a module - bcm47xx: RESET support and other cleanups SPI NOR - Miscellaneous cleanups, to prepare framework for wider use (some further work still pending) - Compile-time configuration to select 4K vs. 64K support for flash that support both (necessary for using UBIFS on some SPI NOR) A few scattered code quality fixes, detected by Coverity See the changesets for more" * tag 'for-linus-20141015' of git://git.infradead.org/linux-mtd: (59 commits) mtd: nand: omap: Correct CONFIG_MTD_NAND_OMAP_BCH help message mtd: nand: Force omap_elm to be built as a module if omap2_nand is a module mtd: move support for struct flash_platform_data into m25p80 mtd: spi-nor: add Kconfig option to disable 4K sectors mtd: nand: Move ELM driver and rename as omap_elm nand: omap2: Replace pr_err with dev_err nand: omap2: Remove horrible ifdefs to fix module probe mtd: nand: add Hynix's H27UCG8T2ATR-BC to nand_ids table mtd: nand: support ONFI timing mode retrieval for non-ONFI NANDs mtd: physmap_of: Add non-obsolete map_rom probe mtd: physmap_of: Fix ROM support via OF MAINTAINERS: add l2-mtd.git, 'next' tree for MTD mtd: denali: fix indents and other trivial things mtd: denali: remove unnecessary parentheses mtd: denali: remove another set-but-unused variable mtd: denali: fix include guard and license block of denali.h mtd: nand: don't break long print messages mtd: bcm47xxnflash: replace some magic numbers mtd: bcm47xxnflash: NAND_CMD_RESET support mtd: bcm47xxnflash: add cmd_ctrl handler ...
No related branches found
No related tags found
Showing
- Documentation/devicetree/bindings/mtd/atmel-nand.txt 2 additions, 0 deletionsDocumentation/devicetree/bindings/mtd/atmel-nand.txt
- Documentation/devicetree/bindings/mtd/mtd-physmap.txt 2 additions, 2 deletionsDocumentation/devicetree/bindings/mtd/mtd-physmap.txt
- MAINTAINERS 1 addition, 0 deletionsMAINTAINERS
- arch/arm/mach-omap2/gpmc.c 2 additions, 0 deletionsarch/arm/mach-omap2/gpmc.c
- drivers/mtd/bcm47xxpart.c 11 additions, 0 deletionsdrivers/mtd/bcm47xxpart.c
- drivers/mtd/chips/cfi_cmdset_0002.c 2 additions, 0 deletionsdrivers/mtd/chips/cfi_cmdset_0002.c
- drivers/mtd/devices/Makefile 0 additions, 1 deletiondrivers/mtd/devices/Makefile
- drivers/mtd/devices/docg3.c 13 additions, 13 deletionsdrivers/mtd/devices/docg3.c
- drivers/mtd/devices/m25p80.c 20 additions, 2 deletionsdrivers/mtd/devices/m25p80.c
- drivers/mtd/maps/Kconfig 1 addition, 1 deletiondrivers/mtd/maps/Kconfig
- drivers/mtd/maps/gpio-addr-flash.c 28 additions, 14 deletionsdrivers/mtd/maps/gpio-addr-flash.c
- drivers/mtd/maps/pcmciamtd.c 1 addition, 1 deletiondrivers/mtd/maps/pcmciamtd.c
- drivers/mtd/maps/physmap_of.c 5 additions, 1 deletiondrivers/mtd/maps/physmap_of.c
- drivers/mtd/mtdchar.c 3 additions, 0 deletionsdrivers/mtd/mtdchar.c
- drivers/mtd/mtdcore.c 18 additions, 21 deletionsdrivers/mtd/mtdcore.c
- drivers/mtd/mtdswap.c 4 additions, 4 deletionsdrivers/mtd/mtdswap.c
- drivers/mtd/nand/Kconfig 5 additions, 2 deletionsdrivers/mtd/nand/Kconfig
- drivers/mtd/nand/Makefile 1 addition, 0 deletionsdrivers/mtd/nand/Makefile
- drivers/mtd/nand/atmel_nand.c 58 additions, 38 deletionsdrivers/mtd/nand/atmel_nand.c
- drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c 49 additions, 8 deletionsdrivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
Loading
Please register or sign in to comment