Skip to content

Commit 2f9339c

Browse files
committed
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
2 parents 463e133 + e964932 commit 2f9339c

File tree

2 files changed

+4
-30
lines changed

2 files changed

+4
-30
lines changed

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

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,6 @@ allOf:
2222
properties:
2323
reg:
2424
minItems: 2
25-
- if:
26-
properties:
27-
compatible:
28-
contains:
29-
enum:
30-
- baikal,bt1-sys-ssi
31-
then:
32-
properties:
33-
mux-controls:
34-
maxItems: 1
35-
required:
36-
- mux-controls
37-
else:
38-
required:
39-
- interrupts
4025
- if:
4126
properties:
4227
compatible:
@@ -75,10 +60,6 @@ properties:
7560
const: intel,mountevans-imc-ssi
7661
- description: AMD Pensando Elba SoC SPI Controller
7762
const: amd,pensando-elba-spi
78-
- description: Baikal-T1 SPI Controller
79-
const: baikal,bt1-ssi
80-
- description: Baikal-T1 System Boot SPI Controller
81-
const: baikal,bt1-sys-ssi
8263
- description: Canaan Kendryte K210 SoS SPI Controller
8364
const: canaan,k210-spi
8465
- description: Renesas RZ/N1 SPI Controller
@@ -170,6 +151,7 @@ required:
170151
- "#address-cells"
171152
- "#size-cells"
172153
- clocks
154+
- interrupts
173155

174156
examples:
175157
- |
@@ -190,15 +172,4 @@ examples:
190172
rx-sample-delay-ns = <7>;
191173
};
192174
};
193-
- |
194-
spi@1f040100 {
195-
compatible = "baikal,bt1-sys-ssi";
196-
reg = <0x1f040100 0x900>,
197-
<0x1c000000 0x1000000>;
198-
#address-cells = <1>;
199-
#size-cells = <0>;
200-
mux-controls = <&boot_mux>;
201-
clocks = <&ccu_sys>;
202-
clock-names = "ssi_clk";
203-
};
204175
...

drivers/spi/spi-stm32.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1625,6 +1625,9 @@ static int stm32_spi_prepare_rx_dma_mdma_chaining(struct stm32_spi *spi,
16251625
return -EINVAL;
16261626
}
16271627

1628+
*rx_mdma_desc = _mdma_desc;
1629+
*rx_dma_desc = _dma_desc;
1630+
16281631
return 0;
16291632
}
16301633

0 commit comments

Comments
 (0)