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

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

* Raw NAND changes:
i.MX8 and i.MX31 now have their own compatible, the Qcom driver got
cleaned, the Broadcom driver got fixed.

* SPI NAND changes:
Two main features have been added:
- OTP support has been brought, and ESMT and Micron manufacturer drivers
  implement it.
- Read retry, and Macronix manufacturer driver implement it.

There is as well a bunch of minor improvements and fixes in drivers and
bindings.
parents 59ee921c b0e63a08

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

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ required: 
  - clock-names

  - interrupts



unevaluatedProperties: true

unevaluatedProperties: false



examples:

  - |

Documentation/devicetree/bindings/mtd/gpmi-nand.yaml

+7 −0
Original line number Diff line number Diff line
@@ -29,7 +29,14 @@ properties: 
          - enum:

              - fsl,imx8mm-gpmi-nand

              - fsl,imx8mn-gpmi-nand

              - fsl,imx8mp-gpmi-nand

              - fsl,imx8mq-gpmi-nand

          - const: fsl,imx7d-gpmi-nand

      - items:

          - enum:

              - fsl,imx8dxl-gpmi-nand

              - fsl,imx8qm-gpmi-nand

          - const: fsl,imx8qxp-gpmi-nand



  reg:

    items:

Documentation/devicetree/bindings/mtd/mxc-nand.yaml

+6 −2
Original line number Diff line number Diff line
@@ -14,8 +14,12 @@ allOf: 


properties:

  compatible:

    const: fsl,imx27-nand



    oneOf:

      - const: fsl,imx27-nand

      - items:

          - enum:

              - fsl,imx31-nand

          - const: fsl,imx27-nand

  reg:

    maxItems: 1

drivers/mtd/nand/raw/brcmnand/brcmnand.c

+1 −1
Original line number Diff line number Diff line
@@ -3008,7 +3008,7 @@ static int brcmnand_resume(struct device *dev) 
		brcmnand_save_restore_cs_config(host, 1);



		/* Reset the chip, required by some chips after power-up */

		nand_reset_op(chip);

		nand_reset(chip, 0);

	}



	return 0;

drivers/mtd/nand/raw/nand_base.c

+2 −2
Original line number Diff line number Diff line
@@ -1833,7 +1833,7 @@ int nand_readid_op(struct nand_chip *chip, u8 addr, void *buf, 


		/* READ_ID data bytes are received twice in NV-DDR mode */

		if (len && nand_interface_is_nvddr(conf)) {

			ddrbuf = kzalloc(len * 2, GFP_KERNEL);

			ddrbuf = kcalloc(2, len, GFP_KERNEL);

			if (!ddrbuf)

				return -ENOMEM;
@@ -2203,7 +2203,7 @@ int nand_read_data_op(struct nand_chip *chip, void *buf, unsigned int len, 
		 * twice.

		 */

		if (force_8bit && nand_interface_is_nvddr(conf)) {

			ddrbuf = kzalloc(len * 2, GFP_KERNEL);

			ddrbuf = kcalloc(2, len, GFP_KERNEL);

			if (!ddrbuf)

				return -ENOMEM;