Commit 2c51d0d8 authored by Miquel Raynal's avatar Miquel Raynal
Browse files

Merge tag 'nand/for-5.19' into mtd/next 



NAND core:
* Print offset instead of page number for bad blocks

Raw NAND controller drivers:
* Cadence: Fix possible null-ptr-deref in cadence_nand_dt_probe()
* CS553X: simplify the return expression of cs553x_write_ctrl_byte()
* Davinci: Remove redundant unsigned comparison to zero
* Denali: Use managed device resources
* GPMI:
  - Add large oob bch setting support
  - Rename the variable ecc_chunk_size
  - Uninline the gpmi_check_ecc function
  - Add strict ecc strength check
  - Refactor BCH geometry settings function
* Intel: Fix possible null-ptr-deref in ebu_nand_probe()
* MPC5121: Check before clk_disable_unprepare() not needed
* Mtk:
  - MTD_NAND_ECC_MEDIATEK should depend on ARCH_MEDIATEK
  - Also parse the default nand-ecc-engine property if available
  - Make mtk_ecc.c a separated module
* OMAP ELM:
  - Convert the bindings to yaml
  - Describe the bindings for AM64 ELM
  - Add support for its compatible
* Renesas: Use runtime PM instead of the raw clock API and update the
           bindings accordingly
* Rockchip: Check before clk_disable_unprepare() not needed
* TMIO: Check return value after calling platform_get_resource()

Raw NAND chip driver:
* Kioxia: Add support for TH58NVG3S0HBAI4 and TC58NVG0S3HTA00

SPI-NAND chip drivers:
* Gigadevice:
  - Add support for:
    - GD5FxGM7xExxG
    - GD5F{2,4}GQ5xExxG
    - GD5F1GQ5RExxG
    - GD5FxGQ4xExxG
  - Fix Quad IO for GD5F1GQ5UExxG
* XTX: Add support for XT26G0xA

Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parents e6828be5 6a2277a0

Documentation/devicetree/bindings/mtd/elm.txt

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
Error location module



Required properties:

- compatible: Must be "ti,am3352-elm"

- reg: physical base address and size of the registers map.

- interrupts: Interrupt number for the elm.



Optional properties:

- ti,hwmods: Name of the hwmod associated to the elm



Example:

elm: elm@0 {

	compatible = "ti,am3352-elm";

	reg = <0x48080000 0x2000>;

	interrupts = <4>;

};

Documentation/devicetree/bindings/mtd/renesas-nandc.yaml

+5 −0
Original line number Diff line number Diff line
@@ -36,11 +36,15 @@ properties: 
      - const: hclk

      - const: eclk



  power-domains:

    maxItems: 1



required:

  - compatible

  - reg

  - clocks

  - clock-names

  - power-domains

  - interrupts



unevaluatedProperties: false
@@ -56,6 +60,7 @@ examples: 
        interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&sysctrl R9A06G032_HCLK_NAND>, <&sysctrl R9A06G032_CLK_NAND>;

        clock-names = "hclk", "eclk";

        power-domains = <&sysctrl>;

        #address-cells = <1>;

        #size-cells = <0>;

    };

Documentation/devicetree/bindings/mtd/ti,elm.yaml

0 → 100644
+72 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/mtd/ti,elm.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Texas Instruments Error Location Module (ELM).



maintainers:

  - Roger Quadros <rogerq@kernel.org>



description:

  ELM module is used together with GPMC and NAND Flash to detect

  errors and the location of the error based on BCH algorithms

  so they can be corrected if possible.



properties:

  compatible:

    enum:

      - ti,am3352-elm

      - ti,am64-elm



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1

    description: Functional clock.



  clock-names:

    items:

      - const: fck



  power-domains:

    maxItems: 1



  ti,hwmods:

    description:

      Name of the HWMOD associated with ELM. This is for legacy

      platforms only.

    $ref: /schemas/types.yaml#/definitions/string

    deprecated: true



required:

  - compatible

  - reg

  - interrupts



allOf:

  - if:

      properties:

        compatible:

          contains:

            const: ti,am64-elm

    then:

      required:

        - clocks

        - clock-names

        - power-domains



additionalProperties: false



examples:

  - |

    elm: ecc@0 {

        compatible = "ti,am3352-elm";

        reg = <0x0 0x2000>;

        interrupts = <4>;

    };

drivers/mtd/nand/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -53,6 +53,14 @@ config MTD_NAND_ECC_MXIC 
	help

	  This enables support for the hardware ECC engine from Macronix.



config MTD_NAND_ECC_MEDIATEK

	tristate "Mediatek hardware ECC engine"

	depends on HAS_IOMEM

	depends on ARCH_MEDIATEK || COMPILE_TEST

	select MTD_NAND_ECC

	help

	  This enables support for the hardware ECC engine from Mediatek.



endmenu



endmenu

drivers/mtd/nand/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


nandcore-objs := core.o bbt.o

obj-$(CONFIG_MTD_NAND_CORE) += nandcore.o

obj-$(CONFIG_MTD_NAND_ECC_MEDIATEK) += ecc-mtk.o



obj-y	+= onenand/

obj-y	+= raw/