Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'spi-fix-v6.5-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fixes from Mark Brown:
"A few mostly minor fixes that came in during the merge window, plus
one administrative update for Jonas' e-mail address.
The spi-geni-qcom fix is more major than the others, fixing the newly
added DMA support for large reads which trigger DMA"
* tag 'spi-fix-v6.5-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
spi: bcm{63xx,bca}-hsspi: update my email address
spi: rzv2m-csi: Fix SoC product name
spi: bcm-qspi: return error if neither hif_mspi nor mspi is available
spi: spi-geni-qcom: enable SPI_CONTROLLER_MUST_TX for GPI DMA mode
+12
-10
+1
-1
drivers/spi/Kconfig
+1
-1
drivers/spi/Kconfig
···
826
826
SPI driver for Renesas RSPI and QSPI blocks.
827
827
828
828
config SPI_RZV2M_CSI
829
-
tristate "Renesas RZV2M CSI controller"
829
+
tristate "Renesas RZ/V2M CSI controller"
830
830
depends on ARCH_RENESAS || COMPILE_TEST
831
831
help
832
832
SPI driver for Renesas RZ/V2M Clocked Serial Interface (CSI)
+3
-7
drivers/spi/spi-bcm-qspi.c
+3
-7
drivers/spi/spi-bcm-qspi.c
···
1543
1543
res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
1544
1544
"mspi");
1545
1545
1546
-
if (res) {
1547
-
qspi->base[MSPI] = devm_ioremap_resource(dev, res);
1548
-
if (IS_ERR(qspi->base[MSPI]))
1549
-
return PTR_ERR(qspi->base[MSPI]);
1550
-
} else {
1551
-
return 0;
1552
-
}
1546
+
qspi->base[MSPI] = devm_ioremap_resource(dev, res);
1547
+
if (IS_ERR(qspi->base[MSPI]))
1548
+
return PTR_ERR(qspi->base[MSPI]);
1553
1549
1554
1550
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "bspi");
1555
1551
if (res) {
+1
-1
drivers/spi/spi-bcm63xx-hsspi.c
+1
-1
drivers/spi/spi-bcm63xx-hsspi.c
···
2
2
* Broadcom BCM63XX High Speed SPI Controller driver
3
3
*
4
4
* Copyright 2000-2010 Broadcom Corporation
5
-
* Copyright 2012-2013 Jonas Gorski <jogo@openwrt.org>
5
+
* Copyright 2012-2013 Jonas Gorski <jonas.gorski@gmail.com>
6
6
*
7
7
* Licensed under the GNU/GPL. See COPYING for details.
8
8
*/
+1
-1
drivers/spi/spi-bcmbca-hsspi.c
+1
-1
drivers/spi/spi-bcmbca-hsspi.c
+6
drivers/spi/spi-geni-qcom.c
+6
drivers/spi/spi-geni-qcom.c
···
1097
1097
if (mas->cur_xfer_mode == GENI_SE_FIFO)
1098
1098
spi->set_cs = spi_geni_set_cs;
1099
1099
1100
+
/*
1101
+
* TX is required per GSI spec, see setup_gsi_xfer().
1102
+
*/
1103
+
if (mas->cur_xfer_mode == GENI_GPI_DMA)
1104
+
spi->flags = SPI_CONTROLLER_MUST_TX;
1105
+
1100
1106
ret = request_irq(mas->irq, geni_spi_isr, 0, dev_name(dev), spi);
1101
1107
if (ret)
1102
1108
goto spi_geni_release_dma;