spi: xlp: Remove Netlogic XLP variants

Netlogic XLP was removed in commit 95b8a5e0111a ("MIPS: Remove NETLOGIC
support"). With those gone, the single platform left to support is
Cavium ThunderX2. Remove the Netlogic variant and DT support.

For simplicity, the existing kconfig name is retained.

Cc: Mark Brown <broonie@kernel.org>
Cc: linux-spi@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20211109161325.2203564-1-robh@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 596705d24400778a5370f519e6982a16510dc2e5..b2a8821971e1d184953a40ab2a44040d977e2201 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -974,14 +974,13 @@ config SPI_XILINX
          Or for the DS570, see "XPS Serial Peripheral Interface (SPI) (v2.00b)"
 
 config SPI_XLP
-       tristate "Netlogic XLP SPI controller driver"
-       depends on CPU_XLP || ARCH_THUNDER2 || COMPILE_TEST
+       tristate "Cavium ThunderX2 SPI controller driver"
+       depends on ARCH_THUNDER2 || COMPILE_TEST
        help
-         Enable support for the SPI controller on the Netlogic XLP SoCs.
-         Currently supported XLP variants are XLP8XX, XLP3XX, XLP2XX, XLP9XX
-         and XLP5XX.
+         Enable support for the SPI controller on the Cavium ThunderX2.
+         (Originally on Netlogic XLP SoCs.)
 
-         If you have a Netlogic XLP platform say Y here.
+         If you have a Cavium ThunderX2 platform say Y here.
          If unsure, say N.
 
 config SPI_XTENSA_XTFPGA

diff --git a/drivers/spi/spi-xlp.c b/drivers/spi/spi-xlp.c
index 797ac0ea8fa37762e13a8e95de1701b6bed7fea5..e5707fe5c8f15b7b3c627ae2a83ceba1191f0dff 100644 (file)
--- a/drivers/spi/spi-xlp.c
+++ b/drivers/spi/spi-xlp.c
@@ -9,7 +9,6 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
-#include <linux/of.h>
 #include <linux/interrupt.h>
 
 /* SPI Configuration Register */
@@ -436,17 +435,10 @@ static const struct acpi_device_id xlp_spi_acpi_match[] = {
 MODULE_DEVICE_TABLE(acpi, xlp_spi_acpi_match);
 #endif
 
-static const struct of_device_id xlp_spi_dt_id[] = {
-       { .compatible = "netlogic,xlp832-spi" },
-       { },
-};
-MODULE_DEVICE_TABLE(of, xlp_spi_dt_id);
-
 static struct platform_driver xlp_spi_driver = {
        .probe  = xlp_spi_probe,
        .driver = {
                .name   = "xlp-spi",
-               .of_match_table = xlp_spi_dt_id,
                .acpi_match_table = ACPI_PTR(xlp_spi_acpi_match),
        },
 };