These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpio / gpio-xgene-sb.c

diff --git a/kernel/drivers/gpio/gpio-xgene-sb.c b/kernel/drivers/gpio/gpio-xgene-sb.c
index fb9d29a..d57068b 100644 (file)
--- a/kernel/drivers/gpio/gpio-xgene-sb.c
+++ b/kernel/drivers/gpio/gpio-xgene-sb.c
@@ -25,8 +25,11 @@
 #include <linux/of_gpio.h>
 #include <linux/gpio.h>
 #include <linux/gpio/driver.h>
+#include <linux/acpi.h>
 #include <linux/basic_mmio_gpio.h>
 
+#include "gpiolib.h"
+
 #define XGENE_MAX_GPIO_DS              22
 #define XGENE_MAX_GPIO_DS_IRQ          6
 
@@ -112,7 +115,6 @@ static int xgene_gpio_sb_probe(struct platform_device *pdev)
                                   GFP_KERNEL);
        if (!priv->irq)
                return -ENOMEM;
-       memset(priv->irq, 0, sizeof(u32) * XGENE_MAX_GPIO_DS);
 
        for (i = 0; i < priv->nirq; i++) {
                priv->irq[default_lines[i]] = platform_get_irq(pdev, i);
@@ -129,6 +131,11 @@ static int xgene_gpio_sb_probe(struct platform_device *pdev)
        else
                dev_info(&pdev->dev, "X-Gene GPIO Standby driver registered\n");
 
+       if (priv->nirq > 0) {
+               /* Register interrupt handlers for gpio signaled acpi events */
+               acpi_gpiochip_request_interrupts(&priv->bgc.gc);
+       }
+
        return ret;
 }
 
@@ -136,6 +143,10 @@ static int xgene_gpio_sb_remove(struct platform_device *pdev)
 {
        struct xgene_gpio_sb *priv = platform_get_drvdata(pdev);
 
+       if (priv->nirq > 0) {
+               acpi_gpiochip_free_interrupts(&priv->bgc.gc);
+       }
+
        return bgpio_remove(&priv->bgc);
 }
 
@@ -145,10 +156,19 @@ static const struct of_device_id xgene_gpio_sb_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, xgene_gpio_sb_of_match);
 
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id xgene_gpio_sb_acpi_match[] = {
+       {"APMC0D15", 0},
+       {},
+};
+MODULE_DEVICE_TABLE(acpi, xgene_gpio_sb_acpi_match);
+#endif
+
 static struct platform_driver xgene_gpio_sb_driver = {
        .driver = {
                   .name = "xgene-gpio-sb",
                   .of_match_table = xgene_gpio_sb_of_match,
+                  .acpi_match_table = ACPI_PTR(xgene_gpio_sb_acpi_match),
                   },
        .probe = xgene_gpio_sb_probe,
        .remove = xgene_gpio_sb_remove,