Unverified Commit 2e4d9f51 authored by Srikanth Boyapally's avatar Srikanth Boyapally Committed by Mark Brown
Browse files

spi: cadence-quadspi: Use quirks to set dma_set_mask instead of compatible... 


spi: cadence-quadspi: Use quirks to set dma_set_mask instead of compatible string for 64-bit DMA support

Remove device compatible property check and instead use
quirks to program DMA addressing.

Signed-off-by: default avatarSrikanth Boyapally <srikanth.boyapally@amd.com>
Link: https://patch.msgid.link/20241120120951.56327-3-srikanth.boyapally@amd.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 40384c84

drivers/spi/spi-cadence-quadspi.c

+4 −3
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ static_assert(CQSPI_MAX_CHIPSELECT <= SPI_CS_CNT_MAX); 
#define CQSPI_SLOW_SRAM		BIT(4)

#define CQSPI_NEEDS_APB_AHB_HAZARD_WAR	BIT(5)

#define CQSPI_RD_NO_IRQ			BIT(6)

#define CQSPI_DMA_SET_MASK		BIT(7)



/* Capabilities */

#define CQSPI_SUPPORTS_OCTAL		BIT(0)
@@ -1881,8 +1882,7 @@ static int cqspi_probe(struct platform_device *pdev) 
				goto probe_reset_failed;

		}



		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;
@@ -2048,7 +2048,8 @@ static const struct cqspi_driver_platdata socfpga_qspi = { 


static const struct cqspi_driver_platdata versal_ospi = {

	.hwcaps_mask = CQSPI_SUPPORTS_OCTAL,

	.quirks = CQSPI_DISABLE_DAC_MODE | CQSPI_SUPPORT_EXTERNAL_DMA,

	.quirks = CQSPI_DISABLE_DAC_MODE | CQSPI_SUPPORT_EXTERNAL_DMA

			| CQSPI_DMA_SET_MASK,

	.indirect_read_dma = cqspi_versal_indirect_read_dma,

	.get_dma_status = cqspi_get_versal_dma_status,

};