The Cadence QSPI compatible string required for the SoCFPGA platform
changed from the default "cdns,qspi-nor" to "intel,socfpga-qspi" with
the introduction of an additional quirk in
commit 98d948eb8331 ("spi: cadence-quadspi: fix write completion support").
However, that change did not preserve the previously used
quirk for this platform. Reinstate the `CQSPI_DISABLE_DAC_MODE` quirk
for the SoCFPGA platform.
Fixes: 98d948eb8331 ("spi: cadence-quadspi: fix write completion support")
Cc: Dinh Nguyen <[email protected]>
Signed-off-by: Ian Abbott <[email protected]>
---
drivers/spi/spi-cadence-quadspi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c
index 41922a5ea1f4..30307392c75a 100644
--- a/drivers/spi/spi-cadence-quadspi.c
+++ b/drivers/spi/spi-cadence-quadspi.c
@@ -1781,7 +1781,7 @@ static const struct cqspi_driver_platdata intel_lgm_qspi = {
};
static const struct cqspi_driver_platdata socfpga_qspi = {
- .quirks = CQSPI_NO_SUPPORT_WR_COMPLETION,
+ .quirks = CQSPI_DISABLE_DAC_MODE | CQSPI_NO_SUPPORT_WR_COMPLETION,
};
static const struct cqspi_driver_platdata versal_ospi = {
--
2.35.1
On 27/04/22 04:34PM, Ian Abbott wrote:
> The Cadence QSPI compatible string required for the SoCFPGA platform
> changed from the default "cdns,qspi-nor" to "intel,socfpga-qspi" with
> the introduction of an additional quirk in
> commit 98d948eb8331 ("spi: cadence-quadspi: fix write completion support").
> However, that change did not preserve the previously used
> quirk for this platform. Reinstate the `CQSPI_DISABLE_DAC_MODE` quirk
> for the SoCFPGA platform.
>
> Fixes: 98d948eb8331 ("spi: cadence-quadspi: fix write completion support")
> Cc: Dinh Nguyen <[email protected]>
> Signed-off-by: Ian Abbott <[email protected]>
Reviewed-by: Pratyush Yadav <[email protected]>
> ---
> drivers/spi/spi-cadence-quadspi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c
> index 41922a5ea1f4..30307392c75a 100644
> --- a/drivers/spi/spi-cadence-quadspi.c
> +++ b/drivers/spi/spi-cadence-quadspi.c
> @@ -1781,7 +1781,7 @@ static const struct cqspi_driver_platdata intel_lgm_qspi = {
> };
>
> static const struct cqspi_driver_platdata socfpga_qspi = {
> - .quirks = CQSPI_NO_SUPPORT_WR_COMPLETION,
> + .quirks = CQSPI_DISABLE_DAC_MODE | CQSPI_NO_SUPPORT_WR_COMPLETION,
> };
>
> static const struct cqspi_driver_platdata versal_ospi = {
> --
> 2.35.1
>
--
Regards,
Pratyush Yadav
Texas Instruments Inc.
On Wed, 27 Apr 2022 16:34:46 +0100, Ian Abbott wrote:
> The Cadence QSPI compatible string required for the SoCFPGA platform
> changed from the default "cdns,qspi-nor" to "intel,socfpga-qspi" with
> the introduction of an additional quirk in
> commit 98d948eb8331 ("spi: cadence-quadspi: fix write completion support").
> However, that change did not preserve the previously used
> quirk for this platform. Reinstate the `CQSPI_DISABLE_DAC_MODE` quirk
> for the SoCFPGA platform.
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
Thanks!
[1/1] spi: cadence-quadspi: fix Direct Access Mode disable for SoCFPGA
commit: f724c296f2f2cc3f9342b0fc26239635cbed856e
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark