spi: xlp: update for ARCH_VULCAN2

ARCH_VULCAN arm64 platform (for Broadcom Vulcan ARM64 processors) has
been discontinued. Cavium's ThunderX2 CN99XX (ARCH_THUNDER2) will be
the next revision of the platform.

Update compile dependencies and ACPI ID to reflect this change. There
is not need to retain ARCH_VULCAN since the Vulcan processor was never
in production and ARCH_VULCAN will be deleted soon.

Signed-off-by: Jayachandran C <jnair@caviumnetworks.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c
index 7dd70927991e7e9e0de14a3af89db442eca8d175..89e74d0a6c331a0c0f1215880d3f712597671de1 100644 (file)
--- a/drivers/acpi/acpi_apd.c
+++ b/drivers/acpi/acpi_apd.c
@@ -164,6 +164,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = {
 #ifdef CONFIG_ARM64
        { "APMC0D0F", APD_ADDR(xgene_i2c_desc) },
        { "BRCM900D", APD_ADDR(vulcan_spi_desc) },
+       { "CAV900D",  APD_ADDR(vulcan_spi_desc) },
 #endif
        { }
 };

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index ec4aa252d6e8c1c761a47246851ad2645382516e..8c40b5216ad63844988e77a2e7848f75b1b982ff 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -705,7 +705,7 @@ config SPI_XILINX
 
 config SPI_XLP
        tristate "Netlogic XLP SPI controller driver"
-       depends on CPU_XLP || ARCH_VULCAN || COMPILE_TEST
+       depends on CPU_XLP || 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

diff --git a/drivers/spi/spi-xlp.c b/drivers/spi/spi-xlp.c
index bea7a93a60468813d904f3d9457c8e8440055ec3..80cb4d6af8924032ed0a6dc5a25085f79325b7dc 100644 (file)
--- a/drivers/spi/spi-xlp.c
+++ b/drivers/spi/spi-xlp.c
@@ -442,6 +442,7 @@ static int xlp_spi_probe(struct platform_device *pdev)
 #ifdef CONFIG_ACPI
 static const struct acpi_device_id xlp_spi_acpi_match[] = {
        { "BRCM900D", 0 },
+       { "CAV900D",  0 },
        { },
 };
 MODULE_DEVICE_TABLE(acpi, xlp_spi_acpi_match);