From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 28 Jun 2023 20:48:42 +0000 (-0700)
Subject: Merge tag 'spi-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
X-Git-Tag: v6.5-rc1~170
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84fccbba93103b22044617e419ba20e1403b4a65;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'spi-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

Pull spi updates from Mark Brown:
 "One small core feature this time around but mostly driver improvements
  and additions for SPI:

   - Add support for controlling the idle state of MOSI, some systems
     can support this and depending on the system integration may need
     it to avoid glitching in some situations

   - Support for polling mode in the S3C64xx driver and DMA on the
     Qualcomm QSPI driver

   - Support for several Allwinner SoCs, AMD Pensando Elba, Intel Mount
     Evans, Renesas RZ/V2M, and ST STM32H7"

* tag 'spi-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (66 commits)
  spi: dt-bindings: atmel,at91rm9200-spi: fix broken sam9x7 compatible
  spi: dt-bindings: atmel,at91rm9200-spi: add sam9x7 compatible
  spi: Add support for Renesas CSI
  spi: dt-bindings: Add bindings for RZ/V2M CSI
  spi: sun6i: Use the new helper to derive the xfer timeout value
  spi: atmel: Prevent false timeouts on long transfers
  spi: dt-bindings: stm32: do not disable spi-slave property for stm32f4-f7
  spi: Create a helper to derive adaptive timeouts
  spi: spi-geni-qcom: correctly handle -EPROBE_DEFER from dma_request_chan()
  spi: stm32: disable spi-slave property for stm32f4-f7
  spi: stm32: introduction of stm32h7 SPI device mode support
  spi: stm32: use dmaengine_terminate_{a}sync instead of _all
  spi: stm32: renaming of spi_master into spi_controller
  spi: dw: Remove misleading comment for Mount Evans SoC
  spi: dt-bindings: snps,dw-apb-ssi: Add compatible for Intel Mount Evans SoC
  spi: dw: Add compatible for Intel Mount Evans SoC
  spi: s3c64xx: Use dev_err_probe()
  spi: s3c64xx: Use the managed spi master allocation function
  spi: spl022: Probe defer is no error
  spi: spi-imx: fix mixing of native and gpio chipselects for imx51/imx53/imx6 variants
  ...
---

84fccbba93103b22044617e419ba20e1403b4a65
diff --cc drivers/spi/spi-cadence-quadspi.c
index 32449bef4415a,620316ab70efc..abf10f92415dc
--- a/drivers/spi/spi-cadence-quadspi.c
+++ b/drivers/spi/spi-cadence-quadspi.c
@@@ -1754,13 -1763,12 +1763,15 @@@ static int cqspi_probe(struct platform_
  			cqspi->wr_completion = false;
  		if (ddata->quirks & CQSPI_SLOW_SRAM)
  			cqspi->slow_sram = true;
+ 		if (ddata->quirks & CQSPI_NEEDS_APB_AHB_HAZARD_WAR)
+ 			cqspi->apb_ahb_hazard = true;
  
  		if (of_device_is_compatible(pdev->dev.of_node,
 -					    "xlnx,versal-ospi-1.0"))
 -			dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
 +					    "xlnx,versal-ospi-1.0")) {
 +			ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
 +			if (ret)
 +				goto probe_reset_failed;
 +		}
  	}
  
  	ret = devm_request_irq(dev, irq, cqspi_irq_handler, 0,