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

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

Pull spi updates from Mark Brown:
 "There's quite a lot of changes for SPI in this release but none in the
  core, they're all mostly small driver updates and additions. Some of
  the more notable changes include:

   - A huge set of cleanups, optimizations and improvements for the
     DesignWare driver from Serge Semin finishing up the work started
     last release.

   - Conversion of the Zynq gqspi driver to spi-mem.

   - Support for Baikal T1, Broadcom BCMSTB 7445, and Renesas R8A7742"

* tag 'spi-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (137 commits)
  spi: cadence: Add SPI transfer delays
  spi: dw: Add Baikal-T1 SPI Controller bindings
  spi: dw: Add Baikal-T1 SPI Controller glue driver
  spi: dw: Add poll-based SPI transfers support
  spi: dw: Introduce max mem-ops SPI bus frequency setting
  spi: dw: Add memory operations support
  spi: dw: Add generic DW SSI status-check method
  spi: dw: Move num-of retries parameter to the header file
  spi: dw: Explicitly de-assert CS on SPI transfer completion
  spi: dw: De-assert chip-select on reset
  spi: dw: Discard chip enabling on DMA setup error
  spi: dw: Unmask IRQs after enabling the chip
  spi: dw: Perform IRQ setup in a dedicated function
  spi: dw: Refactor IRQ-based SPI transfer procedure
  spi: dw: Refactor data IO procedure
  spi: dw: Add DW SPI controller config structure
  spi: dw: Update Rx sample delay in the config function
  spi: dw: Simplify the SPI bus speed config procedure
  spi: dw: Update SPI bus speed in a config function
  spi: dw: Detach SPI device specific CR0 config method
  ...
parents 1724e02e 98873118

Documentation/devicetree/bindings/fsi/ibm,fsi2spi.yaml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ properties: 
  compatible:

    enum:

      - ibm,fsi2spi

      - ibm,fsi2spi-restricted



  reg:

    items:

Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ Required properties: 
    			     			  			    BRCMSTB  SoCs

    "brcm,spi-bcm7435-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI

    			     			  			    BRCMSTB  SoCs

    "brcm,spi-bcm7445-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI

                                                                            BRCMSTB  SoCs

    "brcm,spi-bcm7216-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI

    			     			  			    BRCMSTB  SoCs

    "brcm,spi-bcm7278-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI

Documentation/devicetree/bindings/spi/mediatek,spi-mtk-nor.yaml

0 → 100644
+86 −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/mediatek,spi-mtk-nor.yaml#

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



title: Serial NOR flash controller for MediaTek ARM SoCs



maintainers:

  - Bayi Cheng <bayi.cheng@mediatek.com>

  - Chuanhong Guo <gch981213@gmail.com>



description: |

  This spi controller support single, dual, or quad mode transfer for

  SPI NOR flash. There should be only one spi slave device following

  generic spi bindings. It's not recommended to use this controller

  for devices other than SPI NOR flash due to limited transfer

  capability of this controller.



allOf:

  - $ref: /spi/spi-controller.yaml#



properties:

  compatible:

    oneOf:

      - items:

          - enum:

              - mediatek,mt2701-nor

              - mediatek,mt2712-nor

              - mediatek,mt7622-nor

              - mediatek,mt7623-nor

              - mediatek,mt7629-nor

              - mediatek,mt8192-nor

          - enum:

              - mediatek,mt8173-nor

      - items:

          - const: mediatek,mt8173-nor

  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    items:

      - description: clock used for spi bus

      - description: clock used for controller



  clock-names:

    items:

      - const: spi

      - const: sf



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/clock/mt8173-clk.h>



    soc {

      #address-cells = <2>;

      #size-cells = <2>;



      nor_flash: spi@1100d000 {

        compatible = "mediatek,mt8173-nor";

        reg = <0 0x1100d000 0 0xe0>;

        interrupts = <&spi_flash_irq>;

        clocks = <&pericfg CLK_PERI_SPI>, <&topckgen CLK_TOP_SPINFI_IFR_SEL>;

        clock-names = "spi", "sf";

        #address-cells = <1>;

        #size-cells = <0>;



        flash@0 {

          compatible = "jedec,spi-nor";

          reg = <0>;

        };

      };

    };

Documentation/devicetree/bindings/spi/renesas,rspi.yaml

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


      - items:

          - enum:

              - renesas,qspi-r8a7742   # RZ/G1H

              - renesas,qspi-r8a7743   # RZ/G1M

              - renesas,qspi-r8a7744   # RZ/G1N

              - renesas,qspi-r8a7745   # RZ/G1E

Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ properties: 
              - renesas,msiof-r8a774e1      # RZ/G2H

              - renesas,msiof-r8a7795       # R-Car H3

              - renesas,msiof-r8a7796       # R-Car M3-W

              - renesas,msiof-r8a77961      # R-Car M3-W+

              - renesas,msiof-r8a77965      # R-Car M3-N

              - renesas,msiof-r8a77970      # R-Car V3M

              - renesas,msiof-r8a77980      # R-Car V3H

CRA Git | Maintained and supported by SUSTech CRA and CCSE