From: Jayachandran C Date: Sun, 12 Mar 2017 11:14:28 +0000 (+0000) Subject: gpio: xlp: Update for ARCH_THUNDER2 X-Git-Tag: v4.12-rc1~100^2~49 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=529f75d8ca214aa52ed609d1a909bbe3a71504bf;p=karo-tx-linux.git 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 [Drop depreciation of ARCH_VULCAN] Signed-off-by: Linus Walleij --- diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index a3b07702de88..a386240c5921 100644 --- 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 7cc82cf82b82..d857e1d8e731 100644 --- 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);