gpio: xlp: Add GPIO driver support for Broadcom Vulcan ARM64

- Add GPIO support for Broadcom Vulcan ARM64.
- Add depends on ARCH_VULCAN to Kconfig to enable gpio controller
  driver for Broadcom Vulcan ARM64 SoCs.

Signed-off-by: Kamlakant Patel <kamlakant.patel@broadcom.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 20 insertions, 5 deletions

diff --git a/drivers/gpio/gpio-xlp.c b/drivers/gpio/gpio-xlp.c
index aa5813d2deb1..08897dc11915 100644
--- a/drivers/gpio/gpio-xlp.c
+++ b/drivers/gpio/gpio-xlp.c
@@ -85,7 +85,8 @@ enum {
         XLP_GPIO_VARIANT_XLP316,
         XLP_GPIO_VARIANT_XLP208,
         XLP_GPIO_VARIANT_XLP980,
-        XLP_GPIO_VARIANT_XLP532
+        XLP_GPIO_VARIANT_XLP532,
+        GPIO_VARIANT_VULCAN
 };
 
 struct xlp_gpio_priv {
@@ -285,6 +286,10 @@ static const struct of_device_id xlp_gpio_of_ids[] = {
                 .compatible = "netlogic,xlp532-gpio",
                 .data       = (void *)XLP_GPIO_VARIANT_XLP532,
         },
+        {
+                .compatible = "brcm,vulcan-gpio",
+                .data       = (void *)GPIO_VARIANT_VULCAN,
+        },
         { /* sentinel */ },
 };
 MODULE_DEVICE_TABLE(of, xlp_gpio_of_ids);
@@ -347,6 +352,7 @@ static int xlp_gpio_probe(struct platform_device *pdev)
                 break;
         case XLP_GPIO_VARIANT_XLP980:
         case XLP_GPIO_VARIANT_XLP532:
+        case GPIO_VARIANT_VULCAN:
                 priv->gpio_out_en = gpio_base + GPIO_9XX_OUTPUT_EN;
                 priv->gpio_paddrv = gpio_base + GPIO_9XX_PADDRV;
                 priv->gpio_intr_stat = gpio_base + GPIO_9XX_INT_STAT;
@@ -354,7 +360,12 @@ static int xlp_gpio_probe(struct platform_device *pdev)
                 priv->gpio_intr_pol = gpio_base + GPIO_9XX_INT_POL;
                 priv->gpio_intr_en = gpio_base + GPIO_9XX_INT_EN00;
 
-                ngpio = (soc_type == XLP_GPIO_VARIANT_XLP980) ? 66 : 67;
+                if (soc_type == XLP_GPIO_VARIANT_XLP980)
+                        ngpio = 66;
+                else if (soc_type == XLP_GPIO_VARIANT_XLP532)
+                        ngpio = 67;
+                else
+                        ngpio = 70;
                 break;
         default:
                 dev_err(&pdev->dev, "Unknown Processor type!\n");
@@ -377,10 +388,14 @@ static int xlp_gpio_probe(struct platform_device *pdev)
         gc->get = xlp_gpio_get;
 
         spin_lock_init(&priv->lock);
-        irq_base = irq_alloc_descs(-1, XLP_GPIO_IRQ_BASE, gc->ngpio, 0);
-        if (irq_base < 0) {
+        /* XLP has fixed IRQ range for GPIO interrupts */
+        if (soc_type == GPIO_VARIANT_VULCAN)
+                irq_base = irq_alloc_descs(-1, 0, gc->ngpio, 0);
+        else
+                irq_base = irq_alloc_descs(-1, XLP_GPIO_IRQ_BASE, gc->ngpio, 0);
+        if (IS_ERR_VALUE(irq_base)) {
                 dev_err(&pdev->dev, "Failed to allocate IRQ numbers\n");
-                return -ENODEV;
+                return irq_base;
         }
 
         err = gpiochip_add_data(gc, priv);