Commit 2f9339c
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 bindingsFile tree
2 files changed
+4
-30
lines changed- Documentation/devicetree/bindings/spi
- drivers/spi
2 files changed
+4
-30
lines changedLines changed: 1 addition & 30 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | 25 | | |
41 | 26 | | |
42 | 27 | | |
| |||
75 | 60 | | |
76 | 61 | | |
77 | 62 | | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | 63 | | |
83 | 64 | | |
84 | 65 | | |
| |||
170 | 151 | | |
171 | 152 | | |
172 | 153 | | |
| 154 | + | |
173 | 155 | | |
174 | 156 | | |
175 | 157 | | |
| |||
190 | 172 | | |
191 | 173 | | |
192 | 174 | | |
193 | | - | |
194 | | - | |
195 | | - | |
196 | | - | |
197 | | - | |
198 | | - | |
199 | | - | |
200 | | - | |
201 | | - | |
202 | | - | |
203 | | - | |
204 | 175 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1625 | 1625 | | |
1626 | 1626 | | |
1627 | 1627 | | |
| 1628 | + | |
| 1629 | + | |
| 1630 | + | |
1628 | 1631 | | |
1629 | 1632 | | |
1630 | 1633 | | |
| |||
0 commit comments