Commit 34aac0a3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull spi updates from Mark Brown:
 "This is a very quiet release for SPI, we've got cleanups and minor
  fixes but only a few new driver specific features. The bulk of the
  changes in terms of diffstat are the cleanups, plus one bit of
  performance work for McSPI.

   - Conversions to use devm_clk_get_enabled() and to remove outdated
     terms for controller and device

   - Device mode support for the Renesas CSI

   - Cleanups and improvements to the device tree bindings aimed at
     making validation better

   - PIO FIFO usage for the OMAP2 McSPI, improving performance"

* tag 'spi-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (75 commits)
  spi: omap2-mcspi: Add FIFO support without DMA
  spi: stm32: Explicitly include correct DT includes
  spi: Export acpi_spi_find_controller_by_adev()
  spi: nxp-fspi: use the correct ioremap function
  spi: Don't use flexible array in struct spi_message definition
  spi: bcm2835: add a sentinel at the end of the lookup array
  spi: spi-geni-qcom: Rename the label unmap_if_dma
  spi: rzv2m-csi: Add target mode support
  spi: renesas,rzv2m-csi: Add CSI (SPI) target related property
  spi: spidev: make spidev_class constant
  spi: mpc52xx-psc: Make mpc52xx_psc_spi_transfer_one_message() static
  spi: spi-cadence-quadspi: Fix missing unwind goto warnings
  spi: omap2-mcspi: Fix hardcoded reference clock
  spi: dt-bindings: Make "additionalProperties: true" explicit
  spi: at91-usart: Remove some dead code
  spi: dt-bindings: st,stm32-spi: Move "st,spi-midi-ns" to spi-peripheral-props.yaml
  spi: qup: Vote for interconnect bandwidth to DRAM
  spi: dt-bindings: qup: Document interconnects
  spi: qup: Parse OPP table for DVFS support
  spi: dt-bindings: qup: Document power-domains and OPP
  ...
parents 9d6c80f8 1b2e883e

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

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ properties: 
patternProperties:

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

    type: object

    additionalProperties: true



    properties:

      reg:

        items:

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

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ properties: 
patternProperties:

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

    type: object

    additionalProperties: true



    properties:

      reg:

        items:

Documentation/devicetree/bindings/spi/arm,pl022-peripheral-props.yaml

0 → 100644
+61 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/spi/arm,pl022-peripheral-props.yaml#

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



title: Peripheral-specific properties for Arm PL022 SPI controller



maintainers:

  - Linus Walleij <linus.walleij@linaro.org>



select: false



properties:

  pl022,interface:

    description: SPI interface type

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

    enum:

      - 0      # SPI

      - 1      # Texas Instruments Synchronous Serial Frame Format

      - 2      # Microwire (Half Duplex)



  pl022,com-mode:

    description: Specifies the transfer mode

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

    enum:

      - 0      # interrupt mode

      - 1      # polling mode

      - 2      # DMA mode

    default: 1



  pl022,rx-level-trig:

    description: Rx FIFO watermark level

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

    minimum: 0

    maximum: 4



  pl022,tx-level-trig:

    description: Tx FIFO watermark level

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

    minimum: 0

    maximum: 4



  pl022,ctrl-len:

    description: Microwire interface - Control length

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

    minimum: 0x03

    maximum: 0x1f



  pl022,wait-state:

    description: Microwire interface - Wait state

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

    enum: [0, 1]



  pl022,duplex:

    description: Microwire interface - Full/Half duplex

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

    enum: [0, 1]



additionalProperties: true

...

Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ properties: 
patternProperties:

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

    type: object

    additionalProperties: true



    properties:

      spi-rx-bus-width:

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

+13 −0
Original line number Diff line number Diff line
@@ -44,9 +44,17 @@ properties: 
      - const: tx

      - const: rx



  interconnects:

    maxItems: 1



  interrupts:

    maxItems: 1



  operating-points-v2: true



  power-domains:

    maxItems: 1



  reg:

    maxItems: 1
@@ -62,7 +70,9 @@ unevaluatedProperties: false 
examples:

  - |

    #include <dt-bindings/clock/qcom,gcc-msm8996.h>

    #include <dt-bindings/interconnect/qcom,msm8996.h>

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

    #include <dt-bindings/power/qcom-rpmpd.h>



    spi@7575000 {

        compatible = "qcom,spi-qup-v2.2.1";
@@ -76,6 +86,9 @@ examples: 
        pinctrl-1 = <&blsp1_spi1_sleep>;

        dmas = <&blsp1_dma 12>, <&blsp1_dma 13>;

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

        power-domains = <&rpmpd MSM8996_VDDCX>;

        operating-points-v2 = <&spi_opp_table>;

        interconnects = <&pnoc MASTER_BLSP_1 &bimc SLAVE_EBI_CH0>;

        #address-cells = <1>;

        #size-cells = <0>;

    };