Commit 282aa44c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi updates from Mark Brown:
 "This has mostly been a quiet release for the SPI subsystem, almost all
  cleanups and fixes to existing drivers.

  A couple of changes that stand out:

   - Cleanups and support for version specific features in the
     DesignWare controller.

   - Removal of support for Netlogic devices from the XLP driver, the
     platform had previously been removed by MIPS so the support
     couldn't be used.

   - Conversion of several DT bindings to YAML format"

* tag 'spi-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (53 commits)
  spi: don't include ptp_clock_kernel.h in spi.h
  spi: spi-meson-spifc: Add missing pm_runtime_disable() in meson_spifc_probe
  spi: atmel: Fix typo
  spi: dt-bindings: mediatek,spi-mtk-nor: Fix example 'interrupts' property
  spi: qcom: geni: handle timeout for gpi mode
  spi: qcom: geni: set the error code for gpi transfer
  spi: spi-mux: Add reference to spi-peripheral-props.yaml schema
  spi: ar934x: fix transfer size
  spi: pxa2xx: Propagate firmware node
  spi: dw: Propagate firmware node
  spi: dln2: Propagate firmware node
  spi: ar934x: fix transfer and word delays
  spi: uniphier: Fix a bug that doesn't point to private data correctly
  spi: spi-mtk-nor: add new clock name 'axi' for spi nor
  spi: atmel,quadspi: Define sama7g5 QSPI
  spi: atmel,quadspi: Convert to json-schema
  spi: Fix incorrect cs_setup delay handling
  dt-bindings: mtd: spi-nor: Add a reference to spi-peripheral-props.yaml
  spi: dt-bindings: cdns,qspi-nor: Move peripheral-specific properties out
  spi: dt-bindings: add schema listing peripheral-specific properties
  ...
parents fef8dfae 19629ae4

Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ maintainers: 


allOf:

  - $ref: "mtd.yaml#"

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



properties:

  compatible:
@@ -88,7 +89,7 @@ patternProperties: 
  "^otp(-[0-9]+)?$":

    type: object



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

Documentation/devicetree/bindings/spi/atmel,quadspi.yaml

0 → 100644
+99 −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/spi/atmel,quadspi.yaml#

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



title: Atmel Quad Serial Peripheral Interface (QSPI)



maintainers:

  - Tudor Ambarus <tudor.ambarus@microchip.com>



allOf:

  - $ref: spi-controller.yaml#



properties:

  compatible:

    enum:

      - atmel,sama5d2-qspi

      - microchip,sam9x60-qspi

      - microchip,sama7g5-qspi

      - microchip,sama7g5-ospi



  reg:

    items:

      - description: base registers

      - description: mapped memory



  reg-names:

    items:

      - const: qspi_base

      - const: qspi_mmap



  clocks:

    minItems: 1

    items:

      - description: peripheral clock

      - description: system clock or generic clock, if available



  clock-names:

    minItems: 1

    items:

      - const: pclk

      - enum: [ qspick, gclk ]



  interrupts:

    maxItems: 1



  dmas:

    items:

      - description: tx DMA channel

      - description: rx DMA channel



  dma-names:

    items:

      - const: tx

      - const: rx



  '#address-cells':

    const: 1



  '#size-cells':

    const: 0



required:

  - compatible

  - reg

  - reg-names

  - interrupts

  - clocks

  - clock-names

  - '#address-cells'

  - '#size-cells'



unevaluatedProperties: false



examples:

  - |

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

    #include <dt-bindings/clock/at91.h>

    spi@f0020000 {

        compatible = "atmel,sama5d2-qspi";

        reg = <0xf0020000 0x100>, <0xd0000000 0x8000000>;

        reg-names = "qspi_base", "qspi_mmap";

        interrupts = <52 IRQ_TYPE_LEVEL_HIGH 7>;

        clocks = <&pmc PMC_TYPE_PERIPHERAL 52>;

        clock-names = "pclk";

        #address-cells = <1>;

        #size-cells = <0>;

        pinctrl-names = "default";

        pinctrl-0 = <&pinctrl_spi0_default>;



        flash@0 {

            compatible = "jedec,spi-nor";

            spi-max-frequency = <50000000>;

            reg = <0>;

            spi-rx-bus-width = <4>;

            spi-tx-bus-width = <4>;

        };

    };

Documentation/devicetree/bindings/spi/atmel-quadspi.txt

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
* Atmel Quad Serial Peripheral Interface (QSPI)



Required properties:

- compatible:     Should be one of the following:

		  - "atmel,sama5d2-qspi"

		  - "microchip,sam9x60-qspi"

- reg:            Should contain the locations and lengths of the base registers

                  and the mapped memory.

- reg-names:      Should contain the resource reg names:

                  - qspi_base: configuration register address space

                  - qspi_mmap: memory mapped address space

- interrupts:     Should contain the interrupt for the device.

- clocks:         Should reference the peripheral clock and the QSPI system

                  clock if available.

- clock-names:    Should contain "pclk" for the peripheral clock and "qspick"

                  for the system clock when available.

- #address-cells: Should be <1>.

- #size-cells:    Should be <0>.



Example:



spi@f0020000 {

	compatible = "atmel,sama5d2-qspi";

	reg = <0xf0020000 0x100>, <0xd0000000 0x8000000>;

	reg-names = "qspi_base", "qspi_mmap";

	interrupts = <52 IRQ_TYPE_LEVEL_HIGH 7>;

	clocks = <&pmc PMC_TYPE_PERIPHERAL 52>;

	clock-names = "pclk";

	#address-cells = <1>;

	#size-cells = <0>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_spi0_default>;



	m25p80@0 {

		...

	};

};

Documentation/devicetree/bindings/spi/cdns,qspi-nor-peripheral-props.yaml

0 → 100644
+42 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/spi/cdns,qspi-nor-peripheral-props.yaml#

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



title: Peripheral-specific properties for the Cadence QSPI controller.



description:

  See spi-peripheral-props.yaml for more info.



maintainers:

  - Pratyush Yadav <p.yadav@ti.com>



properties:

  # cdns,qspi-nor.yaml

  cdns,read-delay:

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

    description:

      Delay for read capture logic, in clock cycles.



  cdns,tshsl-ns:

    description:

      Delay in nanoseconds for the length that the master mode chip select

      outputs are de-asserted between transactions.



  cdns,tsd2d-ns:

    description:

      Delay in nanoseconds between one chip select being de-activated

      and the activation of another.



  cdns,tchsh-ns:

    description:

      Delay in nanoseconds between last bit of current transaction and

      deasserting the device chip select (qspi_n_ss_out).



  cdns,tslch-ns:

    description:

      Delay in nanoseconds between setting qspi_n_ss_out low and

      first bit transfer.



additionalProperties: true

Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml

+0 −33
Original line number Diff line number Diff line
@@ -87,39 +87,6 @@ properties: 
    items:

      enum: [ qspi, qspi-ocp ]



# subnode's properties

patternProperties:

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

    type: object

    description:

      Flash device uses the below defined properties in the subnode.



    properties:

      cdns,read-delay:

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

        description:

          Delay for read capture logic, in clock cycles.



      cdns,tshsl-ns:

        description:

          Delay in nanoseconds for the length that the master mode chip select

          outputs are de-asserted between transactions.



      cdns,tsd2d-ns:

        description:

          Delay in nanoseconds between one chip select being de-activated

          and the activation of another.



      cdns,tchsh-ns:

        description:

          Delay in nanoseconds between last bit of current transaction and

          deasserting the device chip select (qspi_n_ss_out).



      cdns,tslch-ns:

        description:

          Delay in nanoseconds between setting qspi_n_ss_out low and

          first bit transfer.



required:

  - compatible

  - reg