summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-bcm-qspi.c
diff options
context:
space:
mode:
authorRay Jui <ray.jui@broadcom.com>2020-09-10 17:25:38 +0200
committerMark Brown <broonie@kernel.org>2020-09-24 13:09:46 +0200
commit00fb259c618ea1198fc51b53a6167aa0d78672a9 (patch)
tree3a0b8d757c66d0c77de8765b5da516f7b088795c /drivers/spi/spi-bcm-qspi.c
parentspi: fsl-dspi: fix use-after-free in remove path (diff)
downloadlinux-00fb259c618ea1198fc51b53a6167aa0d78672a9.tar.xz
linux-00fb259c618ea1198fc51b53a6167aa0d78672a9.zip
spi: bcm-qspi: Fix probe regression on iProc platforms
iProc chips have QSPI controller that does not have the MSPI_REV offset. Reading from that offset will cause a bus error. Fix it by having MSPI_REV query disabled in the generic compatible string. Fixes: 3a01f04d74ef ("spi: bcm-qspi: Handle lack of MSPI_REV offset") Link: https://lore.kernel.org/linux-arm-kernel/20200909211857.4144718-1-f.fainelli@gmail.com/T/#u Signed-off-by: Ray Jui <ray.jui@broadcom.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Link: https://lore.kernel.org/r/20200910152539.45584-3-ray.jui@broadcom.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to '')
-rw-r--r--drivers/spi/spi-bcm-qspi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c
index 681d09085175..9cfa15ec8b08 100644
--- a/drivers/spi/spi-bcm-qspi.c
+++ b/drivers/spi/spi-bcm-qspi.c
@@ -1295,7 +1295,7 @@ static const struct of_device_id bcm_qspi_of_match[] = {
},
{
.compatible = "brcm,spi-bcm-qspi",
- .data = &bcm_qspi_rev_data,
+ .data = &bcm_qspi_no_rev_data,
},
{
.compatible = "brcm,spi-bcm7216-qspi",