From: Ray Jui <ray.jui@broadcom.com>
Date: Thu, 10 Sep 2020 15:25:39 +0000 (-0700)
Subject: spi: bcm-qspi: Clean up 7425, 7429, and 7435 settings
X-Git-Tag: io_uring-5.10-2020-10-20~97^2^2~75
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=3cf5d198785a6b454e6a97246795b0043aff9ac1;p=linux-block.git

spi: bcm-qspi: Clean up 7425, 7429, and 7435 settings

The Broadcom QSPI driver now falls back to no MSPI_DEV support as the
default setting in the generic compatible string, explicit settings for
STB chips 7425, 7429, and 7435 can be removed.

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-4-ray.jui@broadcom.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c
index b78d47a4403c..14c9d0133bce 100644
--- a/drivers/spi/spi-bcm-qspi.c
+++ b/drivers/spi/spi-bcm-qspi.c
@@ -1281,18 +1281,6 @@ static const struct bcm_qspi_data bcm_qspi_spcr3_data = {
 };
 
 static const struct of_device_id bcm_qspi_of_match[] = {
-	{
-		.compatible = "brcm,spi-bcm7425-qspi",
-		.data = &bcm_qspi_no_rev_data,
-	},
-	{
-		.compatible = "brcm,spi-bcm7429-qspi",
-		.data = &bcm_qspi_no_rev_data,
-	},
-	{
-		.compatible = "brcm,spi-bcm7435-qspi",
-		.data = &bcm_qspi_no_rev_data,
-	},
 	{
 		.compatible = "brcm,spi-bcm7445-qspi",
 		.data = &bcm_qspi_rev_data,