Commit 1b49e363 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MTD updates from Miquel Raynal:
 "MTD:

   - prioritize ofpart in physmap-core probing

   - conversions to scoped for each OF child loops

  Bindings:

   - The bulk of the changes consists of binding fixes/updates to
     restrict the use of undefined properties, which was mostly
     ineffective in the current form because of the nesting of partition
     nodes and the lack of compatible strings

   - YAML conversions and the addition of a dma-coherent property in the
     cdns,hp-nfc driver

  SPI NAND:

   - support for octal DTR modes (8D-8D-8D)

   - support for Foresee F35SQB002G chips

  And small misc fixes"

* tag 'mtd/for-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: (65 commits)
  mtd: spi-nor: hisi-sfc: fix refcounting bug in hisi_spi_nor_register_all()
  mtd: spinand: fix NULL pointer dereference in spinand_support_vendor_ops()
  mtd: rawnand: pl353: Add message about ECC mode
  mtd: rawnand: pl353: Fix software ECC support
  mtd: spinand: winbond: Remove unneeded semicolon
  dt-bindings: mtd: cdns,hp-nfc: Add dma-coherent property
  mtd: spinand: Disable continuous read during probe
  mtd: spinand: add Foresee F35SQB002G flash support
  mtd: spinand: winbond: W35N octal DTR support
  mtd: spinand: Add octal DTR support
  mtd: spinand: Warn if using SSDR-only vendor commands in a non SSDR mode
  mtd: spinand: Give the bus interface to the configuration helper
  mtd: spinand: Propagate the bus interface across core helpers
  mtd: spinand: Add support for setting a bus interface
  mtd: spinand: Gather all the bus interface steps in one single function
  mtd: spinand: winbond: Configure the IO mode after the dummy cycles
  mtd: spinand: winbond: Rename IO_MODE register macro
  mtd: spinand: winbond: Fix style
  mtd: spinand: winbond: Register W35N vendor specific operation
  mtd: spinand: winbond: Register W25N vendor specific operation
  ...
parents 72f05009 7e96d76c

Documentation/devicetree/bindings/mmc/mmc-card.yaml

+6 −14
Original line number Diff line number Diff line
@@ -32,21 +32,13 @@ properties: 


patternProperties:

  "^partitions(-boot[12]|-gp[14])?$":

    $ref: /schemas/mtd/partitions/partitions.yaml



    patternProperties:

      "^partition@[0-9a-f]+$":

        $ref: /schemas/mtd/partitions/partition.yaml

    type: object

    additionalProperties: true



    properties:

          reg:

            description: Must be multiple of 512 as it's converted

              internally from bytes to SECTOR_SIZE (512 bytes)



        required:

          - reg



        unevaluatedProperties: false

      compatible:

        contains:

          const: fixed-partitions



required:

  - compatible

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

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ properties: 
        items:

          - const: brcm,nand-iproc

          - const: brcm,brcmnand-v6.1

          - const: brcm,brcmnand

      - description: BCM63168 SoC-specific NAND controller

        items:

          - const: brcm,nand-bcm63168

Documentation/devicetree/bindings/mtd/cdns,hp-nfc.yaml

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ properties: 
  dmas:

    maxItems: 1



  dma-coherent: true



  iommus:

    maxItems: 1

Documentation/devicetree/bindings/mtd/microchip,mchp23k256.txt

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
* MTD SPI driver for Microchip 23K256 (and similar) serial SRAM



Required properties:

- #address-cells, #size-cells : Must be present if the device has sub-nodes

  representing partitions.

- compatible : Must be one of "microchip,mchp23k256" or "microchip,mchp23lcv1024"

- reg : Chip-Select number

- spi-max-frequency : Maximum frequency of the SPI bus the chip can operate at



Example:



	spi-sram@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "microchip,mchp23k256";

		reg = <0>;

		spi-max-frequency = <20000000>;

	};

Documentation/devicetree/bindings/mtd/microchip,mchp23k256.yaml

0 → 100644
+49 −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/microchip,mchp23k256.yaml#

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



title: Microchip 23K256 SPI SRAM



maintainers:

  - Richard Weinberger <richard@nod.at>



description:

  The Microchip 23K256 is a 256 Kbit (32 Kbyte) serial SRAM with an

  SPI interface,supporting clock frequencies up to 20 MHz. It features

  a 32-byte page size for writes and supports byte, page, and

  sequential access modes.



allOf:

  - $ref: /schemas/spi/spi-peripheral-props.yaml#



properties:

  compatible:

    enum:

      - microchip,mchp23k256

      - microchip,mchp23lcv1024



  reg:

    maxItems: 1



required:

  - reg

  - compatible

  - spi-max-frequency



unevaluatedProperties: false



examples:

  - |

    spi {

        #address-cells = <1>;

        #size-cells = <0>;



        sram@0 {

            compatible = "microchip,mchp23k256";

            reg = <0>;

            spi-max-frequency = <20000000>;

        };

    };

...