Commit 6f78b9ac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MTD updates from Richard Weinberger:
 "NAND core changes:
   - Drop useless 'depends on' in Kconfig
   - Add an extra level in the Kconfig hierarchy
   - Trivial spellings
   - Dynamic allocation of the interface configurations
   - Dropping the default ONFI timing mode
   - Various cleanup (types, structures, naming, comments)
   - Hide the chip->data_interface indirection
   - Add the generic rb-gpios property
   - Add the ->choose_interface_config() hook
   - Introduce nand_choose_best_sdr_timings()
   - Use default values for tPROG_max and tBERS_max
   - Avoid redefining tR_max and tCCS_min
   - Add a helper to find the closest ONFI mode
   - bcm63xx MTD parsers: simplify CFE detection

  Raw NAND controller drivers changes:
   - fsl-upm: Deprecation of specific DT properties
   - fsl_upm: Driver rework and cleanup in favor of ->exec_op()
   - Ingenic: Cleanup ARRAY_SIZE() vs sizeof() use
   - brcmnand: ECC error handling on EDU transfers
   - brcmnand: Don't default to EDU transfers
   - qcom: Set BAM mode only if not set already
   - qcom: Avoid write to unavailable register
   - gpio: Driver rework in favor of ->exec_op()
   - tango: ->exec_op() conversion
   - mtk: ->exec_op() conversion

  Raw NAND chip drivers changes:
   - toshiba: Implement ->choose_interface_config() for TH58NVG2S3HBAI4
   - toshiba: Implement ->choose_interface_config() for TC58NVG0S3E
   - toshiba: Implement ->choose_interface_config() for TC58TEG5DCLTA00
   - hynix: Implement ->choose_interface_config() for H27UCG8T2ATR-BC

  HyperBus changes:
   - DMA support for TI's AM654 HyperBus controller driver.
   - HyperBus frontend driver for Renesas RPC-IF driver.

  SPI NOR core changes:
   - Support for Winbond w25q64jwm flash
   - Enable 4K sector support for mx25l12805d

  SPI NOR controller drivers changes:
   - intel-spi Add Alder Lake-S PCI ID

  MTD Core changes:
   - mtdoops: Don't run panic write twice
   - mtdconcat: Correctly handle panic write
   - Use DEFINE_SHOW_ATTRIBUTE"

* tag 'mtd/for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: (76 commits)
  mtd: hyperbus: Fix build failure when only RPCIF_HYPERBUS is enabled
  mtd: hyperbus: add Renesas RPC-IF driver
  Revert "mtd: spi-nor: Prefer asynchronous probe"
  mtd: parsers: bcm63xx: Do not make it modular
  mtd: spear_smi: Enable compile testing
  mtd: maps: vmu-flash: fix typos for struct memcard
  mtd: physmap: Add Baikal-T1 physically mapped ROM support
  mtd: maps: vmu-flash: simplify the return expression of probe_maple_vmu
  mtd: onenand: simplify the return expression of onenand_transfer_auto_oob
  mtd: rawnand: cadence: remove a redundant dev_err call
  mtd: rawnand: ams-delta: Fix non-OF build warning
  mtd: rawnand: Don't overwrite the error code from nand_set_ecc_soft_ops()
  mtd: rawnand: Introduce nand_set_ecc_on_host_ops()
  mtd: rawnand: atmel: Check return values for nand_read_data_op
  mtd: rawnand: vf610: Remove unused function vf610_nfc_transfer_size()
  mtd: rawnand: qcom: Simplify with dev_err_probe()
  mtd: rawnand: marvell: Fix and update kerneldoc
  mtd: rawnand: marvell: Simplify with dev_err_probe()
  mtd: rawnand: gpmi: Simplify with dev_err_probe()
  mtd: rawnand: atmel: Simplify with dev_err_probe()
  ...
parents 5a77b6a0 6402f4ce

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

+31 −0
Original line number Diff line number Diff line
@@ -55,6 +55,37 @@ patternProperties: 
        $ref: /schemas/types.yaml#/definitions/string

        enum: [none, soft, hw, hw_syndrome, hw_oob_first, on-die]



      nand-ecc-engine:

        allOf:

          - $ref: /schemas/types.yaml#/definitions/phandle

        description: |

          A phandle on the hardware ECC engine if any. There are

          basically three possibilities:

          1/ The ECC engine is part of the NAND controller, in this

          case the phandle should reference the parent node.

          2/ The ECC engine is part of the NAND part (on-die), in this

          case the phandle should reference the node itself.

          3/ The ECC engine is external, in this case the phandle should

          reference the specific ECC engine node.



      nand-use-soft-ecc-engine:

        type: boolean

        description: Use a software ECC engine.



      nand-no-ecc-engine:

        type: boolean

        description: Do not use any ECC correction.



      nand-ecc-placement:

        allOf:

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

          - enum: [ oob, interleaved ]

        description:

          Location of the ECC bytes. This location is unknown by default

          but can be explicitly set to "oob", if all ECC bytes are

          known to be stored in the OOB area, or "interleaved" if ECC

          bytes will be interleaved with regular data in the main area.



      nand-ecc-algo:

        description:

          Desired ECC algorithm.

arch/arm/mach-davinci/board-da830-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ static struct davinci_nand_pdata da830_evm_nand_pdata = { 
	.core_chipsel	= 1,

	.parts		= da830_evm_nand_partitions,

	.nr_parts	= ARRAY_SIZE(da830_evm_nand_partitions),

	.ecc_mode	= NAND_ECC_HW,

	.engine_type	= NAND_ECC_ENGINE_TYPE_ON_HOST,

	.ecc_bits	= 4,

	.bbt_options	= NAND_BBT_USE_FLASH,

	.bbt_td		= &da830_evm_nand_bbt_main_descr,

arch/arm/mach-davinci/board-da850-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static struct davinci_nand_pdata da850_evm_nandflash_data = { 
	.core_chipsel	= 1,

	.parts		= da850_evm_nandflash_partition,

	.nr_parts	= ARRAY_SIZE(da850_evm_nandflash_partition),

	.ecc_mode	= NAND_ECC_HW,

	.engine_type	= NAND_ECC_ENGINE_TYPE_ON_HOST,

	.ecc_bits	= 4,

	.bbt_options	= NAND_BBT_USE_FLASH,

	.timing		= &da850_evm_nandflash_timing,

arch/arm/mach-davinci/board-dm355-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static struct davinci_nand_pdata davinci_nand_data = { 
	.mask_chipsel		= BIT(14),

	.parts			= davinci_nand_partitions,

	.nr_parts		= ARRAY_SIZE(davinci_nand_partitions),

	.ecc_mode		= NAND_ECC_HW,

	.engine_type		= NAND_ECC_ENGINE_TYPE_ON_HOST,

	.bbt_options		= NAND_BBT_USE_FLASH,

	.ecc_bits		= 4,

};

arch/arm/mach-davinci/board-dm355-leopard.c

+2 −1
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ static struct davinci_nand_pdata davinci_nand_data = { 
	.mask_chipsel		= BIT(14),

	.parts			= davinci_nand_partitions,

	.nr_parts		= ARRAY_SIZE(davinci_nand_partitions),

	.ecc_mode		= NAND_ECC_HW_SYNDROME,

	.engine_type		= NAND_ECC_ENGINE_TYPE_ON_HOST,

	.ecc_placement		= NAND_ECC_PLACEMENT_INTERLEAVED,

	.ecc_bits		= 4,

	.bbt_options		= NAND_BBT_USE_FLASH,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE