diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-06 14:50:16 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-06 14:50:16 -0600 |
| commit | ae24a21bbd96a7a4a3e82890285255d7e86540f0 (patch) | |
| tree | 2cc7d53c6e0563b9aaaeffb31a8ac5ac9a360034 /include/linux | |
| parent | Merge tag 'regulator-fix-v5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator (diff) | |
| parent | spi: spi_register_controller(): free bus id on error paths (diff) | |
| download | wireguard-linux-ae24a21bbd96a7a4a3e82890285255d7e86540f0.tar.xz wireguard-linux-ae24a21bbd96a7a4a3e82890285255d7e86540f0.zip | |
Merge tag 'spi-fix-v5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fixes from Mark Brown:
"A selection of small fixes, mostly for drivers, that have arrived
since the merge window. None of them are earth shattering in
themselves but all useful for affected systems"
* tag 'spi-fix-v5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
spi: spi_register_controller(): free bus id on error paths
spi: bcm63xx-hsspi: Really keep pll clk enabled
spi: atmel-quadspi: fix possible MMIO window size overrun
spi/zynqmp: remove entry that causes a cs glitch
spi: pxa2xx: Add CS control clock quirk
spi: spidev: Fix CS polarity if GPIO descriptors are used
spi: qup: call spi_qup_pm_resume_runtime before suspending
spi: spi-omap2-mcspi: Support probe deferral for DMA channels
spi: spi-omap2-mcspi: Handle DMA size restriction on AM65x
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/platform_data/spi-omap2-mcspi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/platform_data/spi-omap2-mcspi.h b/include/linux/platform_data/spi-omap2-mcspi.h index 0bf9fddb8306..3b400b1919a9 100644 --- a/include/linux/platform_data/spi-omap2-mcspi.h +++ b/include/linux/platform_data/spi-omap2-mcspi.h @@ -11,6 +11,7 @@ struct omap2_mcspi_platform_config { unsigned short num_cs; unsigned int regs_offset; unsigned int pin_dir:1; + size_t max_xfer_len; }; struct omap2_mcspi_device_config { |