Commit 8bc4d5f394a3facbad6af2f18940f1db3b1a0844
Exists in
smarc_imx_lf-5.15.y
and in
27 other branches
Merge tag 'for-linus-20160523' of git://git.infradead.org/linux-mtd
Pull MTD updates from Brian Norris: "First cycle with Boris as NAND maintainer! Many (most) bullets stolen from him. Generic: - Migrated NAND LED trigger to be a generic MTD trigger NAND: - Introduction of the "ECC algorithm" concept, to avoid overloading the ECC mode field too much more - Replaced the nand_ecclayout infrastructure with something a little more flexible (finally!) and future proof - Rework of the OMAP GPMC and NAND drivers; the TI folks pulled some of this into their own tree as well - Prepare the sunxi NAND driver to receive DMA support - Handle bitflips in erased pages on GPMI revisions that do not support this in hardware. SPI NOR: - Start using the spi_flash_read() API for SPI drivers that support it (i.e., SPI drivers with special memory-mapped flash modes) And other small scattered improvments" * tag 'for-linus-20160523' of git://git.infradead.org/linux-mtd: (155 commits) mtd: spi-nor: support GigaDevice gd25lq64c mtd: nand_bch: fix spelling of "probably" mtd: brcmnand: respect ECC algorithm set by NAND subsystem gpmi-nand: Handle ECC Errors in erased pages Documentation: devicetree: deprecate "soft_bch" nand-ecc-mode value mtd: nand: add support for "nand-ecc-algo" DT property mtd: mtd: drop NAND_ECC_SOFT_BCH enum value mtd: drop support for NAND_ECC_SOFT_BCH as "soft_bch" mapping mtd: nand: read ECC algorithm from the new field mtd: nand: fsmc: validate ECC setup by checking algorithm directly mtd: nand: set ECC algorithm to Hamming on fallback staging: mt29f_spinand: set ECC algorithm explicitly CRIS v32: nand: set ECC algorithm explicitly mtd: nand: atmel: set ECC algorithm explicitly mtd: nand: davinci: set ECC algorithm explicitly mtd: nand: bf5xx: set ECC algorithm explicitly mtd: nand: omap2: Fix high memory dma prefetch transfer mtd: nand: omap2: Start dma request before enabling prefetch mtd: nandsim: add __init attribute mtd: nand: move of_get_nand_xxx() helpers into nand_base.c ...
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
Showing 90 changed files Side-by-side Diff
- Documentation/devicetree/bindings/bus/ti-gpmc.txt
- Documentation/devicetree/bindings/memory-controllers/omap-gpmc.txt
- Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt
- Documentation/devicetree/bindings/mtd/gpmc-nand.txt
- Documentation/devicetree/bindings/mtd/nand.txt
- arch/arm/mach-omap2/gpmc-nand.c
- arch/arm/mach-pxa/spitz.c
- arch/cris/arch-v32/drivers/mach-a3/nandflash.c
- arch/cris/arch-v32/drivers/mach-fs/nandflash.c
- arch/mips/include/asm/mach-jz4740/jz4740_nand.h
- arch/mips/jz4740/board-qi_lb60.c
- drivers/bcma/driver_chipcommon_sflash.c
- drivers/memory/Kconfig
- drivers/memory/fsl_ifc.c
- drivers/memory/omap-gpmc.c
- drivers/mtd/chips/Kconfig
- drivers/mtd/devices/bcm47xxsflash.c
- drivers/mtd/devices/bcm47xxsflash.h
- drivers/mtd/devices/docg3.c
- drivers/mtd/devices/m25p80.c
- drivers/mtd/devices/pmc551.c
- drivers/mtd/maps/ck804xrom.c
- drivers/mtd/maps/esb2rom.c
- drivers/mtd/maps/ichxrom.c
- drivers/mtd/maps/uclinux.c
- drivers/mtd/mtdchar.c
- drivers/mtd/mtdconcat.c
- drivers/mtd/mtdcore.c
- drivers/mtd/mtdpart.c
- drivers/mtd/nand/ams-delta.c
- drivers/mtd/nand/atmel_nand.c
- drivers/mtd/nand/au1550nd.c
- drivers/mtd/nand/bf5xx_nand.c
- drivers/mtd/nand/brcmnand/brcmnand.c
- drivers/mtd/nand/cafe_nand.c
- drivers/mtd/nand/cmx270_nand.c
- drivers/mtd/nand/davinci_nand.c
- drivers/mtd/nand/denali.c
- drivers/mtd/nand/diskonchip.c
- drivers/mtd/nand/docg4.c
- drivers/mtd/nand/fsl_elbc_nand.c
- drivers/mtd/nand/fsl_ifc_nand.c
- drivers/mtd/nand/fsl_upm.c
- drivers/mtd/nand/fsmc_nand.c
- drivers/mtd/nand/gpio.c
- drivers/mtd/nand/gpmi-nand/gpmi-nand.c
- drivers/mtd/nand/hisi504_nand.c
- drivers/mtd/nand/jz4740_nand.c
- drivers/mtd/nand/jz4780_bch.c
- drivers/mtd/nand/jz4780_nand.c
- drivers/mtd/nand/lpc32xx_mlc.c
- drivers/mtd/nand/lpc32xx_slc.c
- drivers/mtd/nand/mpc5121_nfc.c
- drivers/mtd/nand/mxc_nand.c
- drivers/mtd/nand/nand_base.c
- drivers/mtd/nand/nand_bch.c
- drivers/mtd/nand/nandsim.c
- drivers/mtd/nand/nuc900_nand.c
- drivers/mtd/nand/omap2.c
- drivers/mtd/nand/orion_nand.c
- drivers/mtd/nand/pasemi_nand.c
- drivers/mtd/nand/plat_nand.c
- drivers/mtd/nand/pxa3xx_nand.c
- drivers/mtd/nand/qcom_nandc.c
- drivers/mtd/nand/s3c2410.c
- drivers/mtd/nand/sh_flctl.c
- drivers/mtd/nand/sharpsl.c
- drivers/mtd/nand/sm_common.c
- drivers/mtd/nand/socrates_nand.c
- drivers/mtd/nand/sunxi_nand.c
- drivers/mtd/nand/vf610_nfc.c
- drivers/mtd/onenand/onenand_base.c
- drivers/mtd/spi-nor/spi-nor.c
- drivers/of/Makefile
- drivers/of/of_mtd.c
- drivers/staging/mt29f_spinand/mt29f_spinand.c
- include/linux/bcma/bcma_driver_chipcommon.h
- include/linux/fsl_ifc.h
- include/linux/mtd/fsmc.h
- include/linux/mtd/map.h
- include/linux/mtd/mtd.h
- include/linux/mtd/nand.h
- include/linux/mtd/onenand.h
- include/linux/mtd/sharpsl.h
- include/linux/mtd/spi-nor.h
- include/linux/of_mtd.h
- include/linux/omap-gpmc.h
- include/linux/platform_data/gpmc-omap.h
- include/linux/platform_data/mtd-nand-omap2.h
- include/uapi/mtd/mtd-abi.h