Browse Source

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>
Jayachandran C 8 years ago
parent
commit
251831bd4f
3 changed files with 3 additions and 1 deletions
  1. 1 0
      drivers/acpi/acpi_apd.c
  2. 1 1
      drivers/spi/Kconfig
  3. 1 0
      drivers/spi/spi-xlp.c

+ 1 - 0
drivers/acpi/acpi_apd.c

@@ -164,6 +164,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = {
 #ifdef CONFIG_ARM64
 #ifdef CONFIG_ARM64
 	{ "APMC0D0F", APD_ADDR(xgene_i2c_desc) },
 	{ "APMC0D0F", APD_ADDR(xgene_i2c_desc) },
 	{ "BRCM900D", APD_ADDR(vulcan_spi_desc) },
 	{ "BRCM900D", APD_ADDR(vulcan_spi_desc) },
+	{ "CAV900D",  APD_ADDR(vulcan_spi_desc) },
 #endif
 #endif
 	{ }
 	{ }
 };
 };

+ 1 - 1
drivers/spi/Kconfig

@@ -705,7 +705,7 @@ config SPI_XILINX
 
 
 config SPI_XLP
 config SPI_XLP
 	tristate "Netlogic XLP SPI controller driver"
 	tristate "Netlogic XLP SPI controller driver"
-	depends on CPU_XLP || ARCH_VULCAN || COMPILE_TEST
+	depends on CPU_XLP || ARCH_THUNDER2 || COMPILE_TEST
 	help
 	help
 	  Enable support for the SPI controller on the Netlogic XLP SoCs.
 	  Enable support for the SPI controller on the Netlogic XLP SoCs.
 	  Currently supported XLP variants are XLP8XX, XLP3XX, XLP2XX, XLP9XX
 	  Currently supported XLP variants are XLP8XX, XLP3XX, XLP2XX, XLP9XX

+ 1 - 0
drivers/spi/spi-xlp.c

@@ -442,6 +442,7 @@ static int xlp_spi_probe(struct platform_device *pdev)
 #ifdef CONFIG_ACPI
 #ifdef CONFIG_ACPI
 static const struct acpi_device_id xlp_spi_acpi_match[] = {
 static const struct acpi_device_id xlp_spi_acpi_match[] = {
 	{ "BRCM900D", 0 },
 	{ "BRCM900D", 0 },
+	{ "CAV900D",  0 },
 	{ },
 	{ },
 };
 };
 MODULE_DEVICE_TABLE(acpi, xlp_spi_acpi_match);
 MODULE_DEVICE_TABLE(acpi, xlp_spi_acpi_match);