gpio: xlp: Update for ARCH_THUNDER2

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

Update compile dependencies and ACPI ID to reflect this change.

Signed-off-by: Jayachandran C <jnair@caviumnetworks.com>
[Drop depreciation of ARCH_VULCAN]
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index a3b07702de887ffa57e2e5ac03cb0a79c1282fb1..a386240c59210f8ff2841bb7e73d5c30706b7bee 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -505,7 +505,7 @@ config GPIO_XILINX
 
 config GPIO_XLP
        tristate "Netlogic XLP GPIO support"
-       depends on OF_GPIO && (CPU_XLP || ARCH_VULCAN || COMPILE_TEST)
+       depends on OF_GPIO && (CPU_XLP || ARCH_VULCAN || ARCH_THUNDER2 || COMPILE_TEST)
        select GPIOLIB_IRQCHIP
        help
          This driver provides support for GPIO interface on Netlogic XLP MIPS64

diff --git a/drivers/gpio/gpio-xlp.c b/drivers/gpio/gpio-xlp.c
index 7cc82cf82b82e4270620381b767cc2c73d9632ee..d857e1d8e731e7f6e61023e38d960edc6c7c9e8c 100644 (file)
--- a/drivers/gpio/gpio-xlp.c
+++ b/drivers/gpio/gpio-xlp.c
@@ -441,6 +441,7 @@ out_gpio_remove:
 #ifdef CONFIG_ACPI
 static const struct acpi_device_id xlp_gpio_acpi_match[] = {
        { "BRCM9006", GPIO_VARIANT_VULCAN },
+       { "CAV9006",  GPIO_VARIANT_VULCAN },
        {},
 };
 MODULE_DEVICE_TABLE(acpi, xlp_gpio_acpi_match);