Commit 1793eac1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 146d7ce3 879a879c

drivers/spi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ config SPI_RSPI 
	  SPI driver for Renesas RSPI and QSPI blocks.



config SPI_RZV2M_CSI

	tristate "Renesas RZV2M CSI controller"

	tristate "Renesas RZ/V2M CSI controller"

	depends on ARCH_RENESAS || COMPILE_TEST

	help

	  SPI driver for Renesas RZ/V2M Clocked Serial Interface (CSI)

drivers/spi/spi-bcm-qspi.c

+3 −7
Original line number Diff line number Diff line
@@ -1543,13 +1543,9 @@ int bcm_qspi_probe(struct platform_device *pdev, 
		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

						   "mspi");



	if (res) {

	qspi->base[MSPI]  = devm_ioremap_resource(dev, res);

	if (IS_ERR(qspi->base[MSPI]))

		return PTR_ERR(qspi->base[MSPI]);

	} else {

		return 0;

	}



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "bspi");

	if (res) {

drivers/spi/spi-bcm63xx-hsspi.c

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * Broadcom BCM63XX High Speed SPI Controller driver

 *

 * Copyright 2000-2010 Broadcom Corporation

 * Copyright 2012-2013 Jonas Gorski <jogo@openwrt.org>

 * Copyright 2012-2013 Jonas Gorski <jonas.gorski@gmail.com>

 *

 * Licensed under the GNU/GPL. See COPYING for details.

 */

drivers/spi/spi-bcmbca-hsspi.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * Broadcom BCMBCA High Speed SPI Controller driver

 *

 * Copyright 2000-2010 Broadcom Corporation

 * Copyright 2012-2013 Jonas Gorski <jogo@openwrt.org>

 * Copyright 2012-2013 Jonas Gorski <jonas.gorski@gmail.com>

 * Copyright 2019-2022 Broadcom Ltd

 */

drivers/spi/spi-geni-qcom.c

+6 −0
Original line number Diff line number Diff line
@@ -1097,6 +1097,12 @@ static int spi_geni_probe(struct platform_device *pdev) 
	if (mas->cur_xfer_mode == GENI_SE_FIFO)

		spi->set_cs = spi_geni_set_cs;



	/*

	 * TX is required per GSI spec, see setup_gsi_xfer().

	 */

	if (mas->cur_xfer_mode == GENI_GPI_DMA)

		spi->flags = SPI_CONTROLLER_MUST_TX;



	ret = request_irq(mas->irq, geni_spi_isr, 0, dev_name(dev), spi);

	if (ret)

		goto spi_geni_release_dma;