Commit 84fccbba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull spi updates from Mark Brown:
 "One small core feature this time around but mostly driver improvements
  and additions for SPI:

   - Add support for controlling the idle state of MOSI, some systems
     can support this and depending on the system integration may need
     it to avoid glitching in some situations

   - Support for polling mode in the S3C64xx driver and DMA on the
     Qualcomm QSPI driver

   - Support for several Allwinner SoCs, AMD Pensando Elba, Intel Mount
     Evans, Renesas RZ/V2M, and ST STM32H7"

* tag 'spi-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (66 commits)
  spi: dt-bindings: atmel,at91rm9200-spi: fix broken sam9x7 compatible
  spi: dt-bindings: atmel,at91rm9200-spi: add sam9x7 compatible
  spi: Add support for Renesas CSI
  spi: dt-bindings: Add bindings for RZ/V2M CSI
  spi: sun6i: Use the new helper to derive the xfer timeout value
  spi: atmel: Prevent false timeouts on long transfers
  spi: dt-bindings: stm32: do not disable spi-slave property for stm32f4-f7
  spi: Create a helper to derive adaptive timeouts
  spi: spi-geni-qcom: correctly handle -EPROBE_DEFER from dma_request_chan()
  spi: stm32: disable spi-slave property for stm32f4-f7
  spi: stm32: introduction of stm32h7 SPI device mode support
  spi: stm32: use dmaengine_terminate_{a}sync instead of _all
  spi: stm32: renaming of spi_master into spi_controller
  spi: dw: Remove misleading comment for Mount Evans SoC
  spi: dt-bindings: snps,dw-apb-ssi: Add compatible for Intel Mount Evans SoC
  spi: dw: Add compatible for Intel Mount Evans SoC
  spi: s3c64xx: Use dev_err_probe()
  spi: s3c64xx: Use the managed spi master allocation function
  spi: spl022: Probe defer is no error
  spi: spi-imx: fix mixing of native and gpio chipselects for imx51/imx53/imx6 variants
  ...
parents 362067b6 e884a133

Documentation/devicetree/bindings/spi/allwinner,sun4i-a10-spi.yaml

+1 −7
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ maintainers: 
  - Maxime Ripard <mripard@kernel.org>



properties:

  "#address-cells": true

  "#size-cells": true



  compatible:

    const: allwinner,sun4i-a10-spi
@@ -46,12 +43,9 @@ properties: 
      - const: rx

      - const: tx



  num-cs: true



patternProperties:

  "^.*@[0-9a-f]+":

    type: object

    additionalProperties: true

    properties:

      reg:

        items:
@@ -71,7 +65,7 @@ required: 
  - clocks

  - clock-names



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml

+11 −7
Original line number Diff line number Diff line
@@ -14,11 +14,9 @@ maintainers: 
  - Maxime Ripard <mripard@kernel.org>



properties:

  "#address-cells": true

  "#size-cells": true



  compatible:

    oneOf:

      - const: allwinner,sun50i-r329-spi

      - const: allwinner,sun6i-a31-spi

      - const: allwinner,sun8i-h3-spi

      - items:
@@ -28,6 +26,15 @@ properties: 
              - allwinner,sun50i-h616-spi

              - allwinner,suniv-f1c100s-spi

          - const: allwinner,sun8i-h3-spi

      - items:

          - enum:

              - allwinner,sun20i-d1-spi

              - allwinner,sun50i-r329-spi-dbi

          - const: allwinner,sun50i-r329-spi

      - items:

          - const: allwinner,sun20i-d1-spi-dbi

          - const: allwinner,sun50i-r329-spi-dbi

          - const: allwinner,sun50i-r329-spi



  reg:

    maxItems: 1
@@ -58,12 +65,9 @@ properties: 
      - const: rx

      - const: tx



  num-cs: true



patternProperties:

  "^.*@[0-9a-f]+":

    type: object

    additionalProperties: true

    properties:

      reg:

        items:
@@ -83,7 +87,7 @@ required: 
  - clocks

  - clock-names



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

Documentation/devicetree/bindings/spi/atmel,at91rm9200-spi.yaml

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ properties: 
      - items:

          - const: microchip,sam9x60-spi

          - const: atmel,at91rm9200-spi

      - items:

          - const: microchip,sam9x7-spi

          - const: microchip,sam9x60-spi

          - const: atmel,at91rm9200-spi



  reg:

    maxItems: 1

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

+16 −2
Original line number Diff line number Diff line
@@ -46,12 +46,28 @@ allOf: 
          maxItems: 2

          items:

            enum: [ qspi, qspi-ocp ]

  - if:

      properties:

        compatible:

          contains:

            const: amd,pensando-elba-qspi

    then:

      properties:

        cdns,fifo-depth:

          enum: [ 128, 256, 1024 ]

          default: 1024

    else:

      properties:

        cdns,fifo-depth:

          enum: [ 128, 256 ]

          default: 128



properties:

  compatible:

    oneOf:

      - items:

          - enum:

              - amd,pensando-elba-qspi

              - ti,k2g-qspi

              - ti,am654-ospi

              - intel,lgm-qspi
@@ -76,8 +92,6 @@ properties: 
    description:

      Size of the data FIFO in words.

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

    enum: [ 128, 256 ]

    default: 128



  cdns,fifo-width:

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

Documentation/devicetree/bindings/spi/qcom,spi-qcom-qspi.yaml

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ properties: 
  reg:

    maxItems: 1



  iommus:

    maxItems: 1



  interrupts:

    maxItems: 1