diff mbox series

[3/4] spi: bcm-qspi: Fix probe regression on iProc platforms

Message ID 20200910152539.45584-3-ray.jui@broadcom.com
State Accepted
Commit 9a852d44b26f8e60e2ae13df563824c0f8489135
Headers show
Series [1/4] dt-bindings: spi: Add compatible string for brcmstb SoCs | expand

Commit Message

Ray Jui Sept. 10, 2020, 3:25 p.m. UTC 
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>
---
 drivers/spi/spi-bcm-qspi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Florian Fainelli Sept. 10, 2020, 6:20 p.m. UTC | #1 
On 9/10/2020 8:25 AM, Ray Jui wrote:
> 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>
diff mbox series

Patch

diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c
index c5209b42b0d2..b78d47a4403c 100644
--- a/drivers/spi/spi-bcm-qspi.c
+++ b/drivers/spi/spi-bcm-qspi.c
@@ -1300,7 +1300,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",