Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c69aeca authored by Vignesh Raghavendra's avatar Vignesh Raghavendra Committed by Greg Kroah-Hartman
Browse files

mtd: spi-nor: cadence-quadspi: Provide a way to disable DAC mode 



[ Upstream commit a99705079a91e6373122bd0ca2fc129b688fc5b3 ]

Currently direct access mode is used on platforms that have AHB window
(memory mapped window) larger than flash size. This feature is limited
to TI platforms as non TI platforms have < 1MB of AHB window.
Therefore introduce a driver quirk to disable DAC mode and set it for
non TI compatibles. This is in preparation to move to spi-mem framework
where flash geometry cannot be known.

Signed-off-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
Reviewed-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Acked-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/r/20200601070444.16923-3-vigneshr@ti.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Stable-dep-of: 2087e85bb66e ("spi: cadence-quadspi: fix suspend-resume implementations")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent df970829

drivers/mtd/spi-nor/cadence-quadspi.c

+4 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


/* Quirks */

#define CQSPI_NEEDS_WR_DELAY		BIT(0)

#define CQSPI_DISABLE_DAC_MODE		BIT(1)



/* Capabilities mask */

#define CQSPI_BASE_HWCAPS_MASK					\
@@ -1257,7 +1258,8 @@ static int cqspi_setup_flash(struct cqspi_st *cqspi, struct device_node *np) 


		f_pdata->registered = true;



		if (mtd->size <= cqspi->ahb_size) {

		if (mtd->size <= cqspi->ahb_size &&

		    !(ddata->quirks & CQSPI_DISABLE_DAC_MODE)) {

			f_pdata->use_direct_mode = true;

			dev_dbg(nor->dev, "using direct mode for %s\n",

				mtd->name);
@@ -1455,6 +1457,7 @@ static const struct dev_pm_ops cqspi__dev_pm_ops = { 


static const struct cqspi_driver_platdata cdns_qspi = {

	.hwcaps_mask = CQSPI_BASE_HWCAPS_MASK,

	.quirks = CQSPI_DISABLE_DAC_MODE,

};



static const struct cqspi_driver_platdata k2g_qspi = {