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

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

Pull spi updates from Mark Brown:
 "This release is almost entirely driver work, mostly new drivers with
  the usual smattering of per driver updates anf fixes, with only
  trivial changes in the core. Highlights include:

   - Quite a bit of maintainence work on the STM32 and Qualcomm drivers

   - Usage of the newly added devm_dma_request_chan() in the ateml
     driver, pulling in the relevant dmaengine change

   - Cleanups of our usage of the PM autosuspend functions, this pulls
     in some PM core changes on a shared tag

   - Support for ADI sigma-delta triggers, Amlogic SPISG, Mediatek
     MT6991 and MT8196, Renesas RZ/V2H(P) and SOPHGO SG2042"

* tag 'spi-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (62 commits)
  spi: SPISG: Fix less than zero comparison on a u32 variable
  spi: intel: Allow writeable MTD partition with module param
  spi: Add driver for the RZ/V2H(P) RSPI IP
  spi: dt-bindings: Document the RZ/V2H(P) RSPI
  MAINTAINERS: Add an entry for Amlogic spi driver
  spi: Add Amlogic SPISG driver
  spi: dt-bindings: Add binding document of Amlogic SPISG controller
  spi: spi-sg2044-nor: Add SPI-NOR controller for SG2042
  spi: spi-sg2044-nor: Add configurable chip_info
  spi: dt-bindings: spi-sg2044-nor: Change SOPHGO SG2042
  spi: spi-qpic-snand: simplify bad block marker duplication
  spi: spidev: Add an entry for the ABB spi sensors
  dt-bindings: trivial-devices: Document ABB sensors
  spi: stm32-ospi: Fix NULL vs IS_ERR() bug in stm32_ospi_get_resources()
  spi: gpio: Use explicit 'unsigned int' for parameter types
  spi: dt-bindings: spi-mux: Drop "spi-max-frequency" as required
  spi: st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
  spi: rspi: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
  spi: sh-msiof: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
  spi: xilinx: Fix block comment style and minor cleanups
  ...
parents bf977a9a 2d442a0c

Documentation/devicetree/bindings/spi/amlogic,a4-spisg.yaml

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

# Copyright (C) 2025 Amlogic, Inc. All rights reserved

%YAML 1.2

---

$id: http://devicetree.org/schemas/spi/amlogic,a4-spisg.yaml#

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



title: Amlogic SPI Scatter-Gather Controller



maintainers:

  - Xianwei Zhao <xianwei.zhao@amlogic.com>

  - Sunny Luo <sunny.luo@amlogic.com>



allOf:

  - $ref: spi-controller.yaml#



properties:

  compatible:

    const: amlogic,a4-spisg



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 2



  clock-names:

    items:

      - const: core

      - const: pclk



  resets:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names



unevaluatedProperties: false



examples:

  - |

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

    spi@50000 {

        compatible = "amlogic,a4-spisg";

        reg = <0x50000 0x38>;

        interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&clkc 37>,

                 <&clkc 93>;

        clock-names = "core", "pclk";

        #address-cells = <1>;

        #size-cells = <0>;

    };

Documentation/devicetree/bindings/spi/fsl,dspi.yaml

+18 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 
          - fsl,ls2080a-dspi

          - fsl,ls2085a-dspi

          - fsl,lx2160a-dspi

          - nxp,s32g2-dspi

      - items:

          - enum:

              - fsl,ls1012a-dspi
@@ -37,6 +38,9 @@ properties: 
      - items:

          - const: fsl,lx2160a-dspi

          - const: fsl,ls2085a-dspi

      - items:

          - const: nxp,s32g3-dspi

          - const: nxp,s32g2-dspi



  reg:

    maxItems: 1
@@ -114,3 +118,17 @@ examples: 
            spi-cs-hold-delay-ns = <50>;

        };

    };

  # S32G3 in target mode

  - |

    spi@401d4000 {

        compatible = "nxp,s32g3-dspi", "nxp,s32g2-dspi";

        reg = <0x401d4000 0x1000>;

        interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&clks 26>;

        clock-names = "dspi";

        spi-num-chipselects = <8>;

        bus-num = <0>;

        dmas = <&edma0 0 7>, <&edma0 0 8>;

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

        spi-slave;

    };

Documentation/devicetree/bindings/spi/marvell,orion-spi.yaml

0 → 100644
+102 −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/marvell,orion-spi.yaml#

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



title: Marvell Orion SPI controller



maintainers:

  - Andrew Lunn <andrew@lunn.ch>

  - Gregory CLEMENT <gregory.clement@bootlin.com>



allOf:

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



properties:

  compatible:

    oneOf:

      - enum:

          - marvell,orion-spi

          - marvell,armada-380-spi  # For ap80x and cp11x

      - items:

          - enum:

              - marvell,armada-370-spi

              - marvell,armada-375-spi

              - marvell,armada-380-spi

              - marvell,armada-390-spi

              - marvell,armada-xp-spi

          - const: marvell,orion-spi



  cell-index:

    description: Instance id for the SPI controller

    deprecated: true



  reg:

    minItems: 1

    items:

      - description: control registers

      - description: CS0 MBUS target/attribute registers for direct mode

      - description: CS1 MBUS target/attribute registers for direct mode

      - description: CS2 MBUS target/attribute registers for direct mode

      - description: CS3 MBUS target/attribute registers for direct mode

      - description: CS4 MBUS target/attribute registers for direct mode

      - description: CS5 MBUS target/attribute registers for direct mode

      - description: CS6 MBUS target/attribute registers for direct mode

      - description: CS7 MBUS target/attribute registers for direct mode



  clocks:

    minItems: 1

    maxItems: 2



  clock-names:

    items:

      - const: core

      - const: axi



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg

  - clocks



unevaluatedProperties: false



examples:

  - |

    spi@10600 {

      compatible = "marvell,orion-spi";

      #address-cells = <1>;

      #size-cells = <0>;

      cell-index = <0>;

      reg = <0x10600 0x28>;

      clocks = <&coreclk 0>;

      interrupts = <23>;

    };

  - |

    #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))



    bus {

        #address-cells = <2>;

        #size-cells = <1>;



        spi@10600 {

          compatible = "marvell,orion-spi";

          #address-cells = <1>;

          #size-cells = <0>;

          cell-index = <0>;

          reg = <MBUS_ID(0xf0, 0x01) 0x10600 0x28>, /* control */

                <MBUS_ID(0x01, 0x1e) 0 0xffffffff>, /* CS0 */

                <MBUS_ID(0x01, 0x5e) 0 0xffffffff>, /* CS1 */

                <MBUS_ID(0x01, 0x9e) 0 0xffffffff>, /* CS2 */

                <MBUS_ID(0x01, 0xde) 0 0xffffffff>, /* CS3 */

                <MBUS_ID(0x01, 0x1f) 0 0xffffffff>, /* CS4 */

                <MBUS_ID(0x01, 0x5f) 0 0xffffffff>, /* CS5 */

                <MBUS_ID(0x01, 0x9f) 0 0xffffffff>, /* CS6 */

                <MBUS_ID(0x01, 0xdf) 0 0xffffffff>; /* CS7 */

          clocks = <&coreclk 0>;

          interrupts = <23>;

        };

    };

Documentation/devicetree/bindings/spi/mediatek,spi-mt65xx.yaml

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ properties: 
              - mediatek,mt7988-spi-single

              - mediatek,mt8188-spi-ipm

          - const: mediatek,spi-ipm

      - items:

          - enum:

              - mediatek,mt8196-spi

          - const: mediatek,mt6991-spi

      - items:

          - enum:

              - mediatek,mt2701-spi
@@ -46,6 +50,7 @@ properties: 
              - mediatek,mt6589-spi

              - mediatek,mt6765-spi

              - mediatek,mt6893-spi

              - mediatek,mt6991-spi

              - mediatek,mt7622-spi

              - mediatek,mt8135-spi

              - mediatek,mt8173-spi

Documentation/devicetree/bindings/spi/mxs-spi.yaml

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ properties: 
  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1



  dmas:

    maxItems: 1