Merge tag 'nand/for-6.2' into mtd/next
authorMiquel Raynal <miquel.raynal@bootlin.com>
Mon, 5 Dec 2022 14:37:27 +0000 (15:37 +0100)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Mon, 5 Dec 2022 14:37:27 +0000 (15:37 +0100)
commit1d46f1ae82494fae60802c1ed09ca5009e1b414c
treeb5a3d8e47289a97b8e6d2da2075cee14ef2dac23
parent2399401feee27c639addc5b7e6ba519d3ca341bf
parent6408cc05a50aaf88074a5a31d065e5af87a456f5
Merge tag 'nand/for-6.2' into mtd/next

Raw NAND core changes:
* Drop obsolete dependencies on COMPILE_TEST
* MAINTAINERS: rectify entry for MESON NAND controller bindings
* Drop EXPORT_SYMBOL_GPL for nanddev_erase()

Raw NAND driver changes:
* marvell: Enable NFC/DEVBUS arbiter
* gpmi: Use pm_runtime_resume_and_get instead of pm_runtime_get_sync
* mpc5121: Replace NO_IRQ by 0
* lpc32xx_{slc,mlc}:
  - Switch to using pm_ptr()
  - Switch to using gpiod API
* lpc32xx_mlc: Switch to using pm_ptr()
* cadence: Support 64-bit slave dma interface
* rockchip: Describe rk3128-nfc in the bindings
* brcmnand: Update interrupts description in the bindings

SPI-NAND driver changes:
* winbond:
  - Add Winbond W25N02KV flash support
  - Fix flash identification

Fix merge conflict with mtd tree regarding the brcm bindings.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
MAINTAINERS
drivers/mtd/nand/raw/marvell_nand.c