|
@@ -7,6 +7,7 @@
|
|
*
|
|
*
|
|
* All enquiries to support@picochip.com
|
|
* All enquiries to support@picochip.com
|
|
*/
|
|
*/
|
|
|
|
+#include <linux/acpi.h>
|
|
#include <linux/gpio/driver.h>
|
|
#include <linux/gpio/driver.h>
|
|
/* FIXME: for gpio_get_value(), replace this with direct register read */
|
|
/* FIXME: for gpio_get_value(), replace this with direct register read */
|
|
#include <linux/gpio.h>
|
|
#include <linux/gpio.h>
|
|
@@ -27,6 +28,8 @@
|
|
#include <linux/platform_data/gpio-dwapb.h>
|
|
#include <linux/platform_data/gpio-dwapb.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/slab.h>
|
|
|
|
|
|
|
|
+#include "gpiolib.h"
|
|
|
|
+
|
|
#define GPIO_SWPORTA_DR 0x00
|
|
#define GPIO_SWPORTA_DR 0x00
|
|
#define GPIO_SWPORTA_DDR 0x04
|
|
#define GPIO_SWPORTA_DDR 0x04
|
|
#define GPIO_SWPORTB_DR 0x0c
|
|
#define GPIO_SWPORTB_DR 0x0c
|
|
@@ -435,6 +438,10 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
|
|
else
|
|
else
|
|
port->is_registered = true;
|
|
port->is_registered = true;
|
|
|
|
|
|
|
|
+ /* Add GPIO-signaled ACPI event support */
|
|
|
|
+ if (pp->irq)
|
|
|
|
+ acpi_gpiochip_request_interrupts(&port->gc);
|
|
|
|
+
|
|
return err;
|
|
return err;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -502,6 +509,9 @@ dwapb_gpio_get_pdata(struct device *dev)
|
|
dev_warn(dev, "no irq for port%d\n", pp->idx);
|
|
dev_warn(dev, "no irq for port%d\n", pp->idx);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if (has_acpi_companion(dev) && pp->idx == 0)
|
|
|
|
+ pp->irq = platform_get_irq(to_platform_device(dev), 0);
|
|
|
|
+
|
|
pp->irq_shared = false;
|
|
pp->irq_shared = false;
|
|
pp->gpio_base = -1;
|
|
pp->gpio_base = -1;
|
|
}
|
|
}
|
|
@@ -576,6 +586,12 @@ static const struct of_device_id dwapb_of_match[] = {
|
|
};
|
|
};
|
|
MODULE_DEVICE_TABLE(of, dwapb_of_match);
|
|
MODULE_DEVICE_TABLE(of, dwapb_of_match);
|
|
|
|
|
|
|
|
+static const struct acpi_device_id dwapb_acpi_match[] = {
|
|
|
|
+ {"HISI0181", 0},
|
|
|
|
+ { }
|
|
|
|
+};
|
|
|
|
+MODULE_DEVICE_TABLE(acpi, dwapb_acpi_match);
|
|
|
|
+
|
|
#ifdef CONFIG_PM_SLEEP
|
|
#ifdef CONFIG_PM_SLEEP
|
|
static int dwapb_gpio_suspend(struct device *dev)
|
|
static int dwapb_gpio_suspend(struct device *dev)
|
|
{
|
|
{
|
|
@@ -670,6 +686,7 @@ static struct platform_driver dwapb_gpio_driver = {
|
|
.name = "gpio-dwapb",
|
|
.name = "gpio-dwapb",
|
|
.pm = &dwapb_gpio_pm_ops,
|
|
.pm = &dwapb_gpio_pm_ops,
|
|
.of_match_table = of_match_ptr(dwapb_of_match),
|
|
.of_match_table = of_match_ptr(dwapb_of_match),
|
|
|
|
+ .acpi_match_table = ACPI_PTR(dwapb_acpi_match),
|
|
},
|
|
},
|
|
.probe = dwapb_gpio_probe,
|
|
.probe = dwapb_gpio_probe,
|
|
.remove = dwapb_gpio_remove,
|
|
.remove = dwapb_gpio_remove,
|