Commit e109f506 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mtd/for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux 

Pull MTD updates from Miquel Raynal:
 "MTD core changes:
   - Fix issue where write_cached_data() fails but write() still returns
     success

   - maps: sa1100-flash: Replace zero-length array with flexible-array
     member

   - phram: Fix a double free issue in error path

   - Convert fallthrough comments into statements

   - MAINTAINERS: Add the IRC channel to the MTD related subsystems

  Raw NAND core changes:
   - Add support for manufacturer specific suspend/resume operation

   - Add support for manufacturer specific lock/unlock operation

   - Replace zero-length array with flexible-array member

   - Fix a typo ("manufecturer")

   - Ensure nand_soft_waitrdy wait period is enough

  Raw NAND controller driver changes:
   - Brcmnand:
       * Add support for flash-edu for dma transfers (+ bindings)

   - Cadence:
       * Reinit completion before executing a new command
       * Change bad block marker size
       * Fix the calculation of the avaialble OOB size
       * Get meta data size from registers

   - Qualcom:
       * Use dma_request_chan() instead dma_request_slave_channel()
       * Release resources on failure within qcom_nandc_alloc()

   - Allwinner:
       * Use dma_request_chan() instead dma_request_slave_channel()

   - Marvell:
       * Use dma_request_chan() instead dma_request_slave_channel()
       * Release DMA channel on error

   - Freescale:
       * Use dma_request_chan() instead dma_request_slave_channel()

   - Macronix:
       * Add support for Macronix NAND randomizer (+ bindings)

   - Ams-delta:
       * Rename structures and functions to gpio_nand*
       * Make the driver custom I/O ready
       * Drop useless local variable
       * Support custom driver initialisation
       * Add module device tables
       * Handle more GPIO pins as optional
       * Make read pulses optional
       * Don't hardcode read/write pulse widths
       * Push inversion handling to gpiolib
       * Enable OF partition info support
       * Drop board specific partition info
       * Use struct gpio_nand_platdata
       * Write protect device during probe

   - Ingenic:
       * Use devm_platform_ioremap_resource()
       * Add dependency on MIPS || COMPILE_TEST

   - Denali:
       * Deassert write protect pin

   - ST:
       * Use dma_request_chan() instead dma_request_slave_channel()

  Raw NAND chip driver changes:
   - Toshiba:
       * Support reading the number of bitflips for BENAND (Built-in ECC NAND)

   - Macronix:
       * Add support for deep power down mode
       * Add support for block protection

  SPI-NAND core changes:
   - Do not erase the block before writing a bad block marker

   - Explicitly use MTD_OPS_RAW to write the bad block marker to OOB

   - Stop using spinand->oobbuf for buffering bad block markers

   - Rework detect procedure for different READ_ID operation

  SPI-NAND driver changes:
   - Toshiba:
       * Support for new Kioxia Serial NAND
       * Rename function name to change suffix and prefix (8Gbit)
       * Add comment about Kioxia ID

   - Micron:
       * Add new Micron SPI NAND devices with multiple dies
       * Add M70A series Micron SPI NAND devices
       * identify SPI NAND device with Continuous Read mode
       * Add new Micron SPI NAND devices
       * Describe the SPI NAND device MT29F2G01ABAGD
       * Generalize the OOB layout structure and function names

  SPI NOR core changes:
   - Move all the manufacturer specific quirks/code out of the core, to
     make the core logic more readable and thus ease maintenance.

   - Move the SFDP logic out of the core, it provides a better
     separation between the SFDP parsing and core logic.

   - Trim what is exposed in spi-nor.h. The SPI NOR controllers drivers
     must not be able to use structures that are meant just for the SPI
     NOR core.

   - Use the spi-mem direct mapping API to let advanced controllers
     optimize the read/write operations when they support direct
     mapping.

   - Add generic formula for the Status Register block protection
     handling. It fixes some long standing locking limitations and eases
     the addition of the 4bit block protection support.

   - Add block protection support for flashes with 4 block protection
     bits in the Status Register.

  SPI NOR controller drivers changes:
   - The mtk-quadspi driver is replaced by the new spi-mem spi-mtk-nor
     driver.

   - Merge tag 'mtk-mtd-spi-move' into spi-nor/next to avoid conflicts.

  HyperBus changes:
   - Print error msg when compatible is wrong or missing

   - Move mapping of direct access window from core to individual
     drivers"

* tag 'mtd/for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: (103 commits)
  mtd: Convert fallthrough comments into statements
  mtd: rawnand: toshiba: Support reading the number of bitflips for BENAND (Built-in ECC NAND)
  MAINTAINERS: Add the IRC channel to the MTD related subsystems
  mtd: Fix issue where write_cached_data() fails but write() still returns success
  mtd: maps: sa1100-flash: Replace zero-length array with flexible-array member
  mtd: phram: fix a double free issue in error path
  mtd: spinand: toshiba: Support for new Kioxia Serial NAND
  mtd: spinand: toshiba: Rename function name to change suffix and prefix (8Gbit)
  mtd: rawnand: macronix: Add support for deep power down mode
  mtd: rawnand: Add support for manufacturer specific suspend/resume operation
  mtd: spi-nor: Enable locking for n25q512ax3/n25q512a
  mtd: spi-nor: Add SR 4bit block protection support
  mtd: spi-nor: Add generic formula for SR block protection handling
  mtd: spi-nor: Set all BP bits to one when lock_len == mtd->size
  mtd: spi-nor: controllers: aspeed-smc: Replace zero-length array with flexible-array member
  mtd: spi-nor: Clear WEL bit when erase or program errors occur
  MAINTAINERS: update entry after SPI NOR controller move
  mtd: spi-nor: Trim what is exposed in spi-nor.h
  mtd: spi-nor: Drop the MFR definitions
  mtd: spi-nor: Get rid of the now empty spi_nor_ids[] table
  ...
parents e964f1e0 025a06c1

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

+5 −5
Original line number Diff line number Diff line
@@ -35,11 +35,11 @@ Required properties: 
                     (optional) NAND flash cache range (if at non-standard offset)

- reg-names        : a list of the names corresponding to the previous register

                     ranges. Should contain "nand" and (optionally)

                     "flash-dma" and/or "nand-cache".

- interrupts       : The NAND CTLRDY interrupt and (if Flash DMA is available)

                     FLASH_DMA_DONE

- interrupt-names  : May be "nand_ctlrdy" or "flash_dma_done", if broken out as

                     individual interrupts.

                     "flash-dma" or "flash-edu" and/or "nand-cache".

- interrupts       : The NAND CTLRDY interrupt, (if Flash DMA is available)

                     FLASH_DMA_DONE and if EDU is avaialble and used FLASH_EDU_DONE

- interrupt-names  : May be "nand_ctlrdy" or "flash_dma_done" or "flash_edu_done",

                     if broken out as individual interrupts.

                     May be "nand", if the SoC has the individual NAND

                     interrupts multiplexed behind another custom piece of

                     hardware

Documentation/devicetree/bindings/mtd/nand-macronix.txt

0 → 100644
+27 −0
Original line number Diff line number Diff line 
Macronix NANDs Device Tree Bindings

-----------------------------------



Macronix NANDs support randomizer operation for scrambling user data,

which can be enabled with a SET_FEATURE. The penalty when using the

randomizer are subpage accesses prohibited and more time period needed

for program operation, i.e., tPROG 300us to 340us (randomizer enabled).

Enabling the randomizer is a one time persistent and non reversible

operation.



For more high-reliability concern, if subpage write is not available

with hardware ECC and not enabled at UBI level, then enabling the

randomizer is recommended by default by adding a new specific property

in children nodes.



Required NAND chip properties in children mode:

- randomizer enable: should be "mxic,enable-randomizer-otp"



Example:



	nand: nand-controller@unit-address {



		nand@0 {

			reg = <0>;

			mxic,enable-randomizer-otp;

		};

	};

MAINTAINERS

+7 −1
Original line number Diff line number Diff line
@@ -1945,7 +1945,7 @@ F: Documentation/devicetree/bindings/i2c/i2c-lpc2k.txt 
F:	arch/arm/boot/dts/lpc43*

F:	drivers/i2c/busses/i2c-lpc2k.c

F:	drivers/memory/pl172.c

F:	drivers/mtd/spi-nor/nxp-spifi.c

F:	drivers/mtd/spi-nor/controllers/nxp-spifi.c

F:	drivers/rtc/rtc-lpc24xx.c

N:	lpc18xx










@@ -7851,6 +7851,10 @@ F:	Documentation/ABI/testing/debugfs-hyperv



























HYPERBUS SUPPORT















M:	Vignesh Raghavendra <vigneshr@ti.com>













L:	linux-mtd@lists.infradead.org













Q:	http://patchwork.ozlabs.org/project/linux-mtd/list/













T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/next













C:	irc://irc.oftc.net/mtd















S:	Supported















F:	drivers/mtd/hyperbus/















F:	include/linux/mtd/hyperbus.h










@@ -11552,6 +11556,7 @@ L:	linux-mtd@lists.infradead.org













W:	http://www.linux-mtd.infradead.org/















Q:	http://patchwork.ozlabs.org/project/linux-mtd/list/















T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next













C:	irc://irc.oftc.net/mtd















S:	Maintained















F:	drivers/mtd/nand/















F:	include/linux/mtd/*nand*.h










@@ -15835,6 +15840,7 @@ L:	linux-mtd@lists.infradead.org













W:	http://www.linux-mtd.infradead.org/















Q:	http://patchwork.ozlabs.org/project/linux-mtd/list/















T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/next













C:	irc://irc.oftc.net/mtd















S:	Maintained















F:	drivers/mtd/spi-nor/















F:	include/linux/mtd/spi-nor.h

































arch/arm/mach-omap1/board-ams-delta.c



+43
−4






























Original line number
Diff line number
Diff line








@@ -17,6 +17,8 @@













#include <linux/input.h>















#include <linux/interrupt.h>















#include <linux/leds.h>













#include <linux/mtd/nand-gpio.h>













#include <linux/mtd/partitions.h>















#include <linux/platform_device.h>















#include <linux/regulator/consumer.h>















#include <linux/regulator/fixed.h>










@@ -294,9 +296,42 @@ struct modem_private_data {





























static struct modem_private_data modem_priv;





























/*













 * Define partitions for flash device













 */



























static struct mtd_partition partition_info[] = {













	{ .name		= "Kernel",













	  .offset	= 0,













	  .size		= 3 * SZ_1M + SZ_512K },













	{ .name		= "u-boot",













	  .offset	= 3 * SZ_1M + SZ_512K,













	  .size		= SZ_256K },













	{ .name		= "u-boot params",













	  .offset	= 3 * SZ_1M + SZ_512K + SZ_256K,













	  .size		= SZ_256K },













	{ .name		= "Amstrad LDR",













	  .offset	= 4 * SZ_1M,













	  .size		= SZ_256K },













	{ .name		= "File system",













	  .offset	= 4 * SZ_1M + 1 * SZ_256K,













	  .size		= 27 * SZ_1M },













	{ .name		= "PBL reserved",













	  .offset	= 32 * SZ_1M - 3 * SZ_256K,













	  .size		=  3 * SZ_256K },













};



























static struct gpio_nand_platdata nand_platdata = {













	.parts		= partition_info,













	.num_parts	= ARRAY_SIZE(partition_info),













};





























static struct platform_device ams_delta_nand_device = {















	.name	= "ams-delta-nand",















	.id	= -1,













	.dev	= {













		.platform_data = &nand_platdata,













	},















};































#define OMAP_GPIO_LABEL		"gpio-0-15"









@@ -306,10 +341,14 @@ static struct gpiod_lookup_table ams_delta_nand_gpio_table = {













	.table = {















		GPIO_LOOKUP(OMAP_GPIO_LABEL, AMS_DELTA_GPIO_PIN_NAND_RB, "rdy",















			    0),













		GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_NAND_NCE, "nce", 0),













		GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_NAND_NRE, "nre", 0),













		GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_NAND_NWP, "nwp", 0),













		GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_NAND_NWE, "nwe", 0),













		GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_NAND_NCE, "nce",













			    GPIO_ACTIVE_LOW),













		GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_NAND_NRE, "nre",













			    GPIO_ACTIVE_LOW),













		GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_NAND_NWP, "nwp",













			    GPIO_ACTIVE_LOW),













		GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_NAND_NWE, "nwe",













			    GPIO_ACTIVE_LOW),















		GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_NAND_ALE, "ale", 0),















		GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_NAND_CLE, "cle", 0),















		GPIO_LOOKUP_IDX(OMAP_MPUIO_LABEL, 0, "data", 0, 0),

































arch/mips/boot/dts/brcm/bcm7425.dtsi



+2
−2






























Original line number
Diff line number
Diff line








@@ -403,8 +403,8 @@













			compatible = "brcm,brcmnand-v5.0", "brcm,brcmnand";















			#address-cells = <1>;















			#size-cells = <0>;













			reg-names = "nand";













			reg = <0x41b800 0x400>;













			reg-names = "nand", "flash-edu";













			reg = <0x41b800 0x400>, <0x41bc00 0x24>;















			interrupt-parent = <&hif_l2_intc>;















			interrupts = <24>;















			status = "disabled";









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE