From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 9 Aug 2020 19:38:51 +0000 (-0700)
Subject: Merge tag 'mtd/for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux
X-Git-Tag: v5.10.7~1888
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dec1fbbc1d7c46aed9fc1d3ee1f7f4fc04d6ed51;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'mtd/for-5.9' of git://git./linux/kernel/git/mtd/linux

Pull mtd updates from Miquel Raynal:
 "MTD core changes:
   - Spelling
   - http to https updates

  NAND core changes:
   - Drop useless 'depends on' in Kconfig
   - Add an extra level in the Kconfig hierarchy
   - Trivial spellings
   - Dynamic allocation of the interface configurations
   - Dropping the default ONFI timing mode
   - Various cleanup (types, structures, naming, comments)
   - Hide the chip->data_interface indirection
   - Add the generic rb-gpios property
   - Add the ->choose_interface_config() hook
   - Introduce nand_choose_best_sdr_timings()
   - Use default values for tPROG_max and tBERS_max
   - Avoid redefining tR_max and tCCS_min
   - Add a helper to find the closest ONFI mode
   - bcm63xx MTD parsers: simplify CFE detection

  Raw NAND controller drivers changes:
   - fsl-upm: Deprecation of specific DT properties
   - fsl_upm: Driver rework and cleanup in favor of ->exec_op()
   - Ingenic: Cleanup ARRAY_SIZE() vs sizeof() use
   - brcmnand: ECC error handling on EDU transfers
   - brcmnand: Don't default to EDU transfers
   - qcom: Set BAM mode only if not set already
   - qcom: Avoid write to unavailable register
   - gpio: Driver rework in favor of ->exec_op()
   - tango: ->exec_op() conversion
   - mtk: ->exec_op() conversion

  Raw NAND chip drivers changes:
   - toshiba: Implement ->choose_interface_config() for TH58NVG2S3HBAI4,
     TC58NVG0S3E, and TC58TEG5DCLTA00
   - hynix: Implement ->choose_interface_config() for H27UCG8T2ATR-BC

  SPI NOR core changes:
   - Disable Quad Mode in spi_nor_restore().
   - Don't abort BFPT parsing when QER reserved value is used.
   - Add support/update capabilities for few flashes.
   - Drop s70fl01gs flash: it does not support RDSR(05h) which is
     critical for erase/write.
   - Merge the SPIMEM DTR bits in spi-nor/next to avoid conflicts during
     the release cycle.

  SPI NOR controller drivers changes:
   - Move the cadence-quadspi driver to spi-mem. The series was taken
     through the SPI tree. Merge it also in spi-nor/next to avoid
     conflicts during the release cycle.
   - intel-spi:
      - Add new PCI IDs.
      - Ignore the Write Disable command, the controller doesn't support
        it.
      - Fix performance regression"

* tag 'mtd/for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: (79 commits)
  MTD: pfow.h: drop a duplicated word
  MTD: mtd-abi.h: drop a duplicated word
  mtd: rawnand: omap_elm: Replace HTTP links with HTTPS ones
  mtd: Replace HTTP links with HTTPS ones
  mtd: hyperbus: Replace HTTP links with HTTPS ones
  mtd: revert "spi-nor: intel: provide a range for poll_timout"
  mtd: spi-nor: update read capabilities for w25q64 and s25fl064k
  mtd: spi-nor: micron: Add SPI_NOR_DUAL_READ flag on mt25qu02g
  mtd: spi-nor: macronix: Add support for mx66u2g45g
  mtd: spi-nor: intel-spi: Simulate WRDI command
  mtd: spi-nor: Disable the flash quad mode in spi_nor_restore()
  mtd: spi-nor: Add capability to disable flash quad mode
  mtd: spi-nor: spansion: Remove s70fl01gs from flash_info
  mtd: spi-nor: sfdp: do not make invalid quad enable fatal
  dt-bindings: mtd: fsl-upm-nand: Deprecate chip-delay and fsl, upm-wait-flags
  mtd: rawnand: stm32_fmc2: get resources from parent node
  mtd: rawnand: stm32_fmc2: use regmap APIs
  memory: stm32-fmc2-ebi: add STM32 FMC2 EBI controller driver
  dt-bindings: memory-controller: add STM32 FMC2 EBI controller documentation
  dt-bindings: mtd: update STM32 FMC2 NAND controller documentation
  ...
---

dec1fbbc1d7c46aed9fc1d3ee1f7f4fc04d6ed51
diff --cc drivers/memory/Kconfig
index 97440af,be69c07..2c79e95
--- a/drivers/memory/Kconfig
+++ b/drivers/memory/Kconfig
@@@ -179,15 -174,16 +179,25 @@@ config PL353_SM
  	  This driver is for the ARM PL351/PL353 Static Memory
  	  Controller(SMC) module.
  
 +config RENESAS_RPCIF
 +	tristate "Renesas RPC-IF driver"
 +	depends on ARCH_RENESAS
 +	select REGMAP_MMIO
 +	help
 +	  This supports Renesas R-Car Gen3 RPC-IF which provides either SPI
 +	  host or HyperFlash. You'll have to select individual components
 +	  under the corresponding menu.
 +
+ config STM32_FMC2_EBI
+ 	tristate "Support for FMC2 External Bus Interface on STM32MP SoCs"
+ 	depends on MACH_STM32MP157 || COMPILE_TEST
+ 	select MFD_SYSCON
+ 	help
+ 	  Select this option to enable the STM32 FMC2 External Bus Interface
+ 	  controller. This driver configures the transactions with external
+ 	  devices (like SRAM, ethernet adapters, FPGAs, LCD displays, ...) on
+ 	  SOCs containing the FMC2 External Bus Interface.
+ 
  source "drivers/memory/samsung/Kconfig"
  source "drivers/memory/tegra/Kconfig"
  
diff --cc drivers/memory/Makefile
index d105f8e,d3d8d6c..b4533ff
--- a/drivers/memory/Makefile
+++ b/drivers/memory/Makefile
@@@ -22,7 -22,7 +22,8 @@@ obj-$(CONFIG_JZ4780_NEMC)	+= jz4780-nem
  obj-$(CONFIG_MTK_SMI)		+= mtk-smi.o
  obj-$(CONFIG_DA8XX_DDRCTL)	+= da8xx-ddrctl.o
  obj-$(CONFIG_PL353_SMC)		+= pl353-smc.o
 +obj-$(CONFIG_RENESAS_RPCIF)	+= renesas-rpc-if.o
+ obj-$(CONFIG_STM32_FMC2_EBI)	+= stm32-fmc2-ebi.o
  
  obj-$(CONFIG_SAMSUNG_MC)	+= samsung/
  obj-$(CONFIG_TEGRA_MC)		+= tegra/