[PATCH] gpio: xlp: Update for ARCH_THUNDER2

[PATCH] gpio: xlp: Update for ARCH_THUNDER2

[Jayachandran C]

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. There
is not need to retain ARCH_VULCAN since the Vulcan processor was never
in production.

Signed-off-by: Jayachandran C <jnair@caviumnetworks.com>
---
 drivers/gpio/Kconfig    | 2 +-
 drivers/gpio/gpio-xlp.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 0504307..a3f0b4e 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_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 4620d05..15d7669 100644
--- a/drivers/gpio/gpio-xlp.c
+++ b/drivers/gpio/gpio-xlp.c
@@ -441,6 +441,7 @@ static int xlp_gpio_probe(struct platform_device *pdev)
 #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);
-- 
2.7.4

Re: [PATCH] gpio: xlp: Update for ARCH_THUNDER2

[Linus Walleij]

On Sun, Mar 12, 2017 at 12:14 PM, Jayachandran C
<jnair@caviumnetworks.com> wrote:

> 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. There
> is not need to retain ARCH_VULCAN since the Vulcan processor was never
> in production.
>
> Signed-off-by: Jayachandran C <jnair@caviumnetworks.com>

Patch applied.

> -       depends on OF_GPIO && (CPU_XLP || ARCH_VULCAN || COMPILE_TEST)
> +       depends on OF_GPIO && (CPU_XLP || ARCH_THUNDER2 || COMPILE_TEST)

I kept ARCH_VULCAN.

I will consider removing it when Vulcan DTS files etc get removed from
arch/arm64/boot/dts/broadcom/*

People may still be using preproduction boards and I do not want
to screw things up for them.

Yours,
Linus Walleij

Re: [PATCH] gpio: xlp: Update for ARCH_THUNDER2

[Jayachandran C]

On Wed, Mar 15, 2017 at 11:22:58AM +0100, Linus Walleij wrote:
> On Sun, Mar 12, 2017 at 12:14 PM, Jayachandran C
> <jnair@caviumnetworks.com> wrote:
> 
> > 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. There
> > is not need to retain ARCH_VULCAN since the Vulcan processor was never
> > in production.
> >
> > Signed-off-by: Jayachandran C <jnair@caviumnetworks.com>
> 
> Patch applied.
> 
> > -       depends on OF_GPIO && (CPU_XLP || ARCH_VULCAN || COMPILE_TEST)
> > +       depends on OF_GPIO && (CPU_XLP || ARCH_THUNDER2 || COMPILE_TEST)
> 
> I kept ARCH_VULCAN.
> 
> I will consider removing it when Vulcan DTS files etc get removed from
> arch/arm64/boot/dts/broadcom/*

I have a patch posted to move the dts files at:
https://www.spinics.net/lists/arm-kernel/msg568462.html
and I hope it will get merged in the next cycle. I should have added
this to the patch comments, so that you have the complete information.
 
> People may still be using preproduction boards and I do not want
> to screw things up for them.

I understand, I left the Broadcom ACPI and DT strings alone due
to similar concerns. For the Kconfig symbol, it is not much of an
issue, but I'll leave that to your preference.

Thanks,
JC.