Commit 1d46f1ae authored by Miquel Raynal's avatar Miquel Raynal
Browse files

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: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parents 2399401f 6408cc05

Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml

+12 −4
Original line number Diff line number Diff line
@@ -86,15 +86,15 @@ properties: 
    minItems: 1

    items:

      - description: NAND CTLRDY interrupt

      - description: FLASH_DMA_DONE if flash DMA is available

      - description: FLASH_EDU_DONE if EDU is available

      - description: FLASH_DMA_DONE (if flash DMA is available) or FLASH_EDU_DONE (if EDU is available)



  interrupt-names:

    minItems: 1

    items:

      - const: nand_ctlrdy

      - const: flash_dma_done

      - const: flash_edu_done

      - enum:

          - flash_dma_done

          - flash_edu_done



  clocks:

    maxItems: 1
@@ -173,6 +173,13 @@ allOf: 
            - const: nand

            - const: iproc-idm

            - const: iproc-ext

  - if:

      properties:

        interrupts:

          minItems: 2

    then:

      required:

        - interrupt-names



unevaluatedProperties: false
@@ -190,6 +197,7 @@ examples: 
        reg-names = "nand", "flash-dma";

        interrupt-parent = <&hif_intr2_intc>;

        interrupts = <24>, <4>;

        interrupt-names = "nand_ctlrdy", "flash_dma_done";



        #address-cells = <1>;

        #size-cells = <0>;

Documentation/devicetree/bindings/mtd/rockchip,nand-controller.yaml

+3 −1
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ properties: 
      - const: rockchip,rk2928-nfc

      - const: rockchip,rv1108-nfc

      - items:

          - const: rockchip,rk3036-nfc

          - enum:

              - rockchip,rk3036-nfc

              - rockchip,rk3128-nfc

          - const: rockchip,rk2928-nfc

      - items:

          - const: rockchip,rk3308-nfc

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -13382,7 +13382,7 @@ MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS 
M:	Liang Yang <liang.yang@amlogic.com>

L:	linux-mtd@lists.infradead.org

S:	Maintained

F:	Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt

F:	Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml

F:	drivers/mtd/nand/raw/meson_*









MESON VIDEO DECODER DRIVER FOR AMLOGIC SOCS
































drivers/mtd/nand/core.c



+1
−2






























Original line number
Diff line number
Diff line







@@ -126,7 +126,7 @@ EXPORT_SYMBOL_GPL(nanddev_isreserved);







 *









 * Return: 0 in case of success, a negative error code otherwise.









 */









int nanddev_erase(struct nand_device *nand, const struct nand_pos *pos)









static int nanddev_erase(struct nand_device *nand, const struct nand_pos *pos)









{









	if (nanddev_isbad(nand, pos) || nanddev_isreserved(nand, pos)) {









		pr_warn("attempt to erase a bad/reserved block @%llx\n",








@@ -136,7 +136,6 @@ int nanddev_erase(struct nand_device *nand, const struct nand_pos *pos)

















	return nand->ops->erase(nand, pos);









}









EXPORT_SYMBOL_GPL(nanddev_erase);



















/**









 * nanddev_mtd_erase() - Generic mtd->_erase() implementation for NAND devices
































drivers/mtd/nand/raw/Kconfig



+3
−3






























Original line number
Diff line number
Diff line







@@ -415,7 +415,7 @@ config MTD_NAND_PLATFORM

















config MTD_NAND_CADENCE









	tristate "Support Cadence NAND (HPNFC) controller"









	depends on (OF || COMPILE_TEST) && HAS_IOMEM









	depends on OF && HAS_IOMEM









	help









	  Enable the driver for NAND flash on platforms using a Cadence NAND









	  controller.








@@ -430,7 +430,7 @@ config MTD_NAND_ARASAN

















config MTD_NAND_INTEL_LGM









	tristate "Support for NAND controller on Intel LGM SoC"









	depends on OF || COMPILE_TEST









	depends on OF









	depends on HAS_IOMEM









	help









	  Enables support for NAND Flash chips on Intel's LGM SoC.








@@ -450,7 +450,7 @@ config MTD_NAND_ROCKCHIP

















config MTD_NAND_PL35X









	tristate "ARM PL35X NAND controller"









	depends on OF || COMPILE_TEST









	depends on OF









	depends on PL353_SMC









	help









	  Enables support for PrimeCell SMC PL351 and PL353 NAND