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

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

Pull mtd updates from Miquel Raynal:
 "MTD core changes:
   - Spelling
   - http to https updates

  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,
     TC58NVG0S3E, and TC58TEG5DCLTA00
   - hynix: Implement ->choose_interface_config() for H27UCG8T2ATR-BC

  SPI NOR core changes:
   - Disable Quad Mode in spi_nor_restore().
   - Don't abort BFPT parsing when QER reserved value is used.
   - Add support/update capabilities for few flashes.
   - Drop s70fl01gs flash: it does not support RDSR(05h) which is
     critical for erase/write.
   - Merge the SPIMEM DTR bits in spi-nor/next to avoid conflicts during
     the release cycle.

  SPI NOR controller drivers changes:
   - Move the cadence-quadspi driver to spi-mem. The series was taken
     through the SPI tree. Merge it also in spi-nor/next to avoid
     conflicts during the release cycle.
   - intel-spi:
      - Add new PCI IDs.
      - Ignore the Write Disable command, the controller doesn't support
        it.
      - Fix performance regression"

* tag 'mtd/for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: (79 commits)
  MTD: pfow.h: drop a duplicated word
  MTD: mtd-abi.h: drop a duplicated word
  mtd: rawnand: omap_elm: Replace HTTP links with HTTPS ones
  mtd: Replace HTTP links with HTTPS ones
  mtd: hyperbus: Replace HTTP links with HTTPS ones
  mtd: revert "spi-nor: intel: provide a range for poll_timout"
  mtd: spi-nor: update read capabilities for w25q64 and s25fl064k
  mtd: spi-nor: micron: Add SPI_NOR_DUAL_READ flag on mt25qu02g
  mtd: spi-nor: macronix: Add support for mx66u2g45g
  mtd: spi-nor: intel-spi: Simulate WRDI command
  mtd: spi-nor: Disable the flash quad mode in spi_nor_restore()
  mtd: spi-nor: Add capability to disable flash quad mode
  mtd: spi-nor: spansion: Remove s70fl01gs from flash_info
  mtd: spi-nor: sfdp: do not make invalid quad enable fatal
  dt-bindings: mtd: fsl-upm-nand: Deprecate chip-delay and fsl, upm-wait-flags
  mtd: rawnand: stm32_fmc2: get resources from parent node
  mtd: rawnand: stm32_fmc2: use regmap APIs
  memory: stm32-fmc2-ebi: add STM32 FMC2 EBI controller driver
  dt-bindings: memory-controller: add STM32 FMC2 EBI controller documentation
  dt-bindings: mtd: update STM32 FMC2 NAND controller documentation
  ...
parents 71fa1a44 6a138027

Documentation/devicetree/bindings/memory-controllers/st,stm32-fmc2-ebi.yaml

0 → 100644
+252 −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/memory-controllers/st,stm32-fmc2-ebi.yaml#

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



title: STMicroelectronics Flexible Memory Controller 2 (FMC2) Bindings



description: |

  The FMC2 functional block makes the interface with: synchronous and

  asynchronous static devices (such as PSNOR, PSRAM or other memory-mapped

  peripherals) and NAND flash memories.

  Its main purposes are:

    - to translate AXI transactions into the appropriate external device

      protocol

    - to meet the access time requirements of the external devices

  All external devices share the addresses, data and control signals with the

  controller. Each external device is accessed by means of a unique Chip

  Select. The FMC2 performs only one access at a time to an external device.



maintainers:

  - Christophe Kerello <christophe.kerello@st.com>



properties:

  compatible:

    const: st,stm32mp1-fmc2-ebi



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  resets:

    maxItems: 1



  "#address-cells":

    const: 2



  "#size-cells":

    const: 1



  ranges:

    description: |

      Reflects the memory layout with four integer values per bank. Format:

      <bank-number> 0 <address of the bank> <size>



patternProperties:

  "^.*@[0-4],[a-f0-9]+$":

    type: object



    properties:

      reg:

        description: Bank number, base address and size of the device.



      st,fmc2-ebi-cs-transaction-type:

        description: |

          Select one of the transactions type supported

          0: Asynchronous mode 1 SRAM/FRAM.

          1: Asynchronous mode 1 PSRAM.

          2: Asynchronous mode A SRAM/FRAM.

          3: Asynchronous mode A PSRAM.

          4: Asynchronous mode 2 NOR.

          5: Asynchronous mode B NOR.

          6: Asynchronous mode C NOR.

          7: Asynchronous mode D NOR.

          8: Synchronous read synchronous write PSRAM.

          9: Synchronous read asynchronous write PSRAM.

          10: Synchronous read synchronous write NOR.

          11: Synchronous read asynchronous write NOR.

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

        minimum: 0

        maximum: 11



      st,fmc2-ebi-cs-cclk-enable:

        description: Continuous clock enable (first bank must be configured

          in synchronous mode). The FMC_CLK is generated continuously

          during asynchronous and synchronous access. By default, the

          FMC_CLK is only generated during synchronous access.

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



      st,fmc2-ebi-cs-mux-enable:

        description: Address/Data multiplexed on databus (valid only with

          NOR and PSRAM transactions type). By default, Address/Data

          are not multiplexed.

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



      st,fmc2-ebi-cs-buswidth:

        description: Data bus width

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

        enum: [ 8, 16 ]

        default: 16



      st,fmc2-ebi-cs-waitpol-high:

        description: Wait signal polarity (NWAIT signal active high).

          By default, NWAIT is active low.

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



      st,fmc2-ebi-cs-waitcfg-enable:

        description: The NWAIT signal indicates wheither the data from the

          device are valid or if a wait state must be inserted when accessing

          the device in synchronous mode. By default, the NWAIT signal is

          active one data cycle before wait state.

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



      st,fmc2-ebi-cs-wait-enable:

        description: The NWAIT signal is enabled (its level is taken into

          account after the programmed latency period to insert wait states

          if asserted). By default, the NWAIT signal is disabled.

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



      st,fmc2-ebi-cs-asyncwait-enable:

        description: The NWAIT signal is taken into account during asynchronous

          transactions. By default, the NWAIT signal is not taken into account

          during asynchronous transactions.

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



      st,fmc2-ebi-cs-cpsize:

        description: CRAM page size. The controller splits the burst access

          when the memory page is reached. By default, no burst split when

          crossing page boundary.

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

        enum: [ 0, 128, 256, 512, 1024 ]

        default: 0



      st,fmc2-ebi-cs-byte-lane-setup-ns:

        description: This property configures the byte lane setup timing

          defined in nanoseconds from NBLx low to Chip Select NEx low.



      st,fmc2-ebi-cs-address-setup-ns:

        description: This property defines the duration of the address setup

          phase in nanoseconds used for asynchronous read/write transactions.



      st,fmc2-ebi-cs-address-hold-ns:

        description: This property defines the duration of the address hold

          phase in nanoseconds used for asynchronous multiplexed read/write

          transactions.



      st,fmc2-ebi-cs-data-setup-ns:

        description: This property defines the duration of the data setup phase

          in nanoseconds used for asynchronous read/write transactions.



      st,fmc2-ebi-cs-bus-turnaround-ns:

        description: This property defines the delay in nanoseconds between the

          end of current read/write transaction and the next transaction.



      st,fmc2-ebi-cs-data-hold-ns:

        description: This property defines the duration of the data hold phase

          in nanoseconds used for asynchronous read/write transactions.



      st,fmc2-ebi-cs-clk-period-ns:

        description: This property defines the FMC_CLK output signal period in

          nanoseconds.



      st,fmc2-ebi-cs-data-latency-ns:

        description: This property defines the data latency before reading or

          writing the first data in nanoseconds.



      st,fmc2_ebi-cs-write-address-setup-ns:

        description: This property defines the duration of the address setup

          phase in nanoseconds used for asynchronous write transactions.



      st,fmc2-ebi-cs-write-address-hold-ns:

        description: This property defines the duration of the address hold

          phase in nanoseconds used for asynchronous multiplexed write

          transactions.



      st,fmc2-ebi-cs-write-data-setup-ns:

        description: This property defines the duration of the data setup

          phase in nanoseconds used for asynchronous write transactions.



      st,fmc2-ebi-cs-write-bus-turnaround-ns:

        description: This property defines the delay between the end of current

          write transaction and the next transaction in nanoseconds.



      st,fmc2-ebi-cs-write-data-hold-ns:

        description: This property defines the duration of the data hold phase

          in nanoseconds used for asynchronous write transactions.



      st,fmc2-ebi-cs-max-low-pulse-ns:

        description: This property defines the maximum chip select low pulse

          duration in nanoseconds for synchronous transactions. When this timing

          reaches 0, the controller splits the current access, toggles NE to

          allow device refresh and restarts a new access.



    required:

      - reg



required:

  - "#address-cells"

  - "#size-cells"

  - compatible

  - reg

  - clocks

  - ranges



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/clock/stm32mp1-clks.h>

    #include <dt-bindings/reset/stm32mp1-resets.h>

    memory-controller@58002000 {

      #address-cells = <2>;

      #size-cells = <1>;

      compatible = "st,stm32mp1-fmc2-ebi";

      reg = <0x58002000 0x1000>;

      clocks = <&rcc FMC_K>;

      resets = <&rcc FMC_R>;



      ranges = <0 0 0x60000000 0x04000000>, /* EBI CS 1 */

               <1 0 0x64000000 0x04000000>, /* EBI CS 2 */

               <2 0 0x68000000 0x04000000>, /* EBI CS 3 */

               <3 0 0x6c000000 0x04000000>, /* EBI CS 4 */

               <4 0 0x80000000 0x10000000>; /* NAND */



      psram@0,0 {

        compatible = "mtd-ram";

        reg = <0 0x00000000 0x100000>;

        bank-width = <2>;



        st,fmc2-ebi-cs-transaction-type = <1>;

        st,fmc2-ebi-cs-address-setup-ns = <60>;

        st,fmc2-ebi-cs-data-setup-ns = <30>;

        st,fmc2-ebi-cs-bus-turnaround-ns = <5>;

      };



      nand-controller@4,0 {

        #address-cells = <1>;

        #size-cells = <0>;

        compatible = "st,stm32mp1-fmc2-nfc";

        reg = <4 0x00000000 0x1000>,

              <4 0x08010000 0x1000>,

              <4 0x08020000 0x1000>,

              <4 0x01000000 0x1000>,

              <4 0x09010000 0x1000>,

              <4 0x09020000 0x1000>;

        interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;

        dmas = <&mdma1 20 0x2 0x12000a02 0x0 0x0>,

               <&mdma1 20 0x2 0x12000a08 0x0 0x0>,

               <&mdma1 21 0x2 0x12000a0a 0x0 0x0>;

        dma-names = "tx", "rx", "ecc";



        nand@0 {

          reg = <0>;

          nand-on-flash-bbt;

          #address-cells = <1>;

          #size-cells = <1>;

        };

      };

    };



...

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

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ This file provides information, what the device node for the davinci/keystone 
NAND interface contains.



Documentation:

Davinci DM646x - http://www.ti.com/lit/ug/sprueq7c/sprueq7c.pdf

Kestone - http://www.ti.com/lit/ug/sprugz3a/sprugz3a.pdf

Davinci DM646x - https://www.ti.com/lit/ug/sprueq7c/sprueq7c.pdf

Kestone - https://www.ti.com/lit/ug/sprugz3a/sprugz3a.pdf



Required properties:

Documentation/devicetree/bindings/mtd/fsl-upm-nand.txt

+5 −5
Original line number Diff line number Diff line
@@ -7,14 +7,16 @@ Required properties: 
- fsl,upm-cmd-offset : UPM pattern offset for the command latch.



Optional properties:

- fsl,upm-wait-flags : add chip-dependent short delays after running the

	UPM pattern (0x1), after writing a data byte (0x2) or after

	writing out a buffer (0x4).

- fsl,upm-addr-line-cs-offsets : address offsets for multi-chip support.

	The corresponding address lines are used to select the chip.

- gpios : may specify optional GPIOs connected to the Ready-Not-Busy pins

	(R/B#). For multi-chip devices, "n" GPIO definitions are required

	according to the number of chips.



Deprecated properties:

- fsl,upm-wait-flags : add chip-dependent short delays after running the

	UPM pattern (0x1), after writing a data byte (0x2) or after

	writing out a buffer (0x4).

- chip-delay : chip dependent delay for transferring data from array to

	read registers (tR). Required if property "gpios" is not used

	(R/B# pins not connected).
@@ -52,8 +54,6 @@ upm@3,0 { 
	fsl,upm-cmd-offset = <0x08>;

	/* Multi-chip NAND device */

	fsl,upm-addr-line-cs-offsets = <0x0 0x200>;

	fsl,upm-wait-flags = <0x5>;

	chip-delay = <25>; // in micro-seconds



	nand@0 {

		#address-cells = <1>;

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

+7 −0
Original line number Diff line number Diff line
@@ -114,6 +114,13 @@ patternProperties: 
        description:

          Contains the native Ready/Busy IDs.



      rb-gpios:

        description:

          Contains one or more GPIO descriptor (the numper of descriptor

          depends on the number of R/B pins exposed by the flash) for the

          Ready/Busy pins. Active state refers to the NAND ready state and

          should be set to GPIOD_ACTIVE_HIGH unless the signal is inverted.



    required:

      - reg

Documentation/devicetree/bindings/mtd/st,stm32-fmc2-nand.yaml

+57 −26
Original line number Diff line number Diff line
@@ -9,32 +9,19 @@ title: STMicroelectronics Flexible Memory Controller 2 (FMC2) Bindings 
maintainers:

  - Christophe Kerello <christophe.kerello@st.com>



allOf:

  - $ref: "nand-controller.yaml#"



properties:

  compatible:

    const: st,stm32mp15-fmc2

    enum:

      - st,stm32mp15-fmc2

      - st,stm32mp1-fmc2-nfc



  reg:

    items:

      - description: Registers

      - description: Chip select 0 data

      - description: Chip select 0 command

      - description: Chip select 0 address space

      - description: Chip select 1 data

      - description: Chip select 1 command

      - description: Chip select 1 address space

    minItems: 6

    maxItems: 7



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1



  resets:

    maxItems: 1



  dmas:

    items:

      - description: tx DMA channel
@@ -57,11 +44,55 @@ patternProperties: 
      nand-ecc-strength:

        enum: [1, 4 ,8 ]



allOf:

  - $ref: "nand-controller.yaml#"



  - if:

      properties:

        compatible:

          contains:

            const: st,stm32mp15-fmc2

    then:

      properties:

        reg:

          items:

            - description: Registers

            - description: Chip select 0 data

            - description: Chip select 0 command

            - description: Chip select 0 address space

            - description: Chip select 1 data

            - description: Chip select 1 command

            - description: Chip select 1 address space



        clocks:

          maxItems: 1



        resets:

          maxItems: 1



      required:

        - clocks



  - if:

      properties:

        compatible:

          contains:

            const: st,stm32mp1-fmc2-nfc

    then:

      properties:

        reg:

          items:

            - description: Chip select 0 data

            - description: Chip select 0 command

            - description: Chip select 0 address space

            - description: Chip select 1 data

            - description: Chip select 1 command

            - description: Chip select 1 address space



required:

  - compatible

  - reg

  - interrupts

  - clocks



examples:

  - |
@@ -78,9 +109,9 @@ examples: 
            <0x89010000 0x1000>,

            <0x89020000 0x1000>;

      interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;

            dmas = <&mdma1 20 0x10 0x12000a02 0x0 0x0>,

                   <&mdma1 20 0x10 0x12000a08 0x0 0x0>,

                   <&mdma1 21 0x10 0x12000a0a 0x0 0x0>;

      dmas = <&mdma1 20 0x2 0x12000a02 0x0 0x0>,

             <&mdma1 20 0x2 0x12000a08 0x0 0x0>,

             <&mdma1 21 0x2 0x12000a0a 0x0 0x0>;

      dma-names = "tx", "rx", "ecc";

      clocks = <&rcc FMC_K>;

      resets = <&rcc FMC_R>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE