Commit 2f9339c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-fix-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fixes from Mark Brown:
 "One fix for the stm32 driver which got broken for DMA chaining cases,
  plus a removal of some straggling bindings for the Bikal SoC which has
  been pulled out of the kernel"

* tag 'spi-fix-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: stm32: fix missing pointer assignment in case of dma chaining
  spi: dt-bindings: snps,dw-abp-ssi: Remove unused bindings
parents 463e1337 e9649322

Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml

+1 −30
Original line number Diff line number Diff line
@@ -22,21 +22,6 @@ allOf: 
      properties:

        reg:

          minItems: 2

  - if:

      properties:

        compatible:

          contains:

            enum:

              - baikal,bt1-sys-ssi

    then:

      properties:

        mux-controls:

          maxItems: 1

      required:

        - mux-controls

    else:

      required:

        - interrupts

  - if:

      properties:

        compatible:
@@ -75,10 +60,6 @@ properties: 
        const: intel,mountevans-imc-ssi

      - description: AMD Pensando Elba SoC SPI Controller

        const: amd,pensando-elba-spi

      - description: Baikal-T1 SPI Controller

        const: baikal,bt1-ssi

      - description: Baikal-T1 System Boot SPI Controller

        const: baikal,bt1-sys-ssi

      - description: Canaan Kendryte K210 SoS SPI Controller

        const: canaan,k210-spi

      - description: Renesas RZ/N1 SPI Controller
@@ -170,6 +151,7 @@ required: 
  - "#address-cells"

  - "#size-cells"

  - clocks

  - interrupts



examples:

  - |
@@ -190,15 +172,4 @@ examples: 
        rx-sample-delay-ns = <7>;

      };

    };

  - |

    spi@1f040100 {

      compatible = "baikal,bt1-sys-ssi";

      reg = <0x1f040100 0x900>,

            <0x1c000000 0x1000000>;

      #address-cells = <1>;

      #size-cells = <0>;

      mux-controls = <&boot_mux>;

      clocks = <&ccu_sys>;

      clock-names = "ssi_clk";

    };

...

drivers/spi/spi-stm32.c

+3 −0
Original line number Diff line number Diff line
@@ -1625,6 +1625,9 @@ static int stm32_spi_prepare_rx_dma_mdma_chaining(struct stm32_spi *spi, 
		return -EINVAL;

	}



	*rx_mdma_desc = _mdma_desc;

	*rx_dma_desc = _dma_desc;



	return 0;

}