From: Mark Brown <broonie@kernel.org>
Date: Tue, 10 Dec 2024 12:12:44 +0000 (+0000)
Subject: spi: Merge up fixes
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b7cc281812c4e0545d415e9761d5b03e130a41f2;p=users%2Fjedix%2Flinux-maple.git

spi: Merge up fixes

Silly add/add conflict in the Cadence QuadSPI driver.
---

b7cc281812c4e0545d415e9761d5b03e130a41f2
diff --cc drivers/spi/spi-cadence-quadspi.c
index 27bd759d39ec7,a031ecb358e08..47477f2d9a25b
--- a/drivers/spi/spi-cadence-quadspi.c
+++ b/drivers/spi/spi-cadence-quadspi.c
@@@ -43,8 -43,7 +43,9 @@@ static_assert(CQSPI_MAX_CHIPSELECT <= S
  #define CQSPI_SLOW_SRAM		BIT(4)
  #define CQSPI_NEEDS_APB_AHB_HAZARD_WAR	BIT(5)
  #define CQSPI_RD_NO_IRQ			BIT(6)
 -#define CQSPI_DISABLE_STIG_MODE		BIT(7)
 +#define CQSPI_DMA_SET_MASK		BIT(7)
 +#define CQSPI_SUPPORT_DEVICE_RESET	BIT(8)
++#define CQSPI_DISABLE_STIG_MODE		BIT(9)
  
  /* Capabilities */
  #define CQSPI_SUPPORTS_OCTAL		BIT(0)
@@@ -1903,8 -1883,11 +1906,10 @@@ static int cqspi_probe(struct platform_
  			if (ret)
  				goto probe_reset_failed;
  		}
+ 		if (ddata->quirks & CQSPI_DISABLE_STIG_MODE)
+ 			cqspi->disable_stig_mode = true;
  
 -		if (of_device_is_compatible(pdev->dev.of_node,
 -					    "xlnx,versal-ospi-1.0")) {
 +		if (ddata->quirks & CQSPI_DMA_SET_MASK) {
  			ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
  			if (ret)
  				goto probe_reset_failed;