summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDuc Dang <dhdang@apm.com>2016-04-30 13:49:27 -0700
committerLinus Walleij <linus.walleij@linaro.org>2016-05-01 10:23:12 +0200
commit0c60de3f73cddde6a83979c64f63cb1101f5326c (patch)
tree37f725dff459a5b8e3442c3b1b941424d5789ef6 /drivers
parentf002d07c56c7b7007328e8fff2adf04db1c81e90 (diff)
downloadlinux-stable-0c60de3f73cddde6a83979c64f63cb1101f5326c.tar.gz
linux-stable-0c60de3f73cddde6a83979c64f63cb1101f5326c.tar.bz2
linux-stable-0c60de3f73cddde6a83979c64f63cb1101f5326c.zip
gpio: xgene: Enable ACPI support for X-Gene GFC GPIO driver
This patch enables ACPI support for X-Gene GFC GPIO driver. Signed-off-by: Duc Dang <dhdang@apm.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpio/gpio-xgene.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-xgene.c b/drivers/gpio/gpio-xgene.c
index 4193502fe3be..46faecd1f580 100644
--- a/drivers/gpio/gpio-xgene.c
+++ b/drivers/gpio/gpio-xgene.c
@@ -17,6 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <linux/acpi.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/io.h>
@@ -211,10 +212,18 @@ static const struct of_device_id xgene_gpio_of_match[] = {
{},
};
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id xgene_gpio_acpi_match[] = {
+ { "APMC0D14", 0 },
+ { },
+};
+#endif
+
static struct platform_driver xgene_gpio_driver = {
.driver = {
.name = "xgene-gpio",
.of_match_table = xgene_gpio_of_match,
+ .acpi_match_table = ACPI_PTR(xgene_gpio_acpi_match),
.pm = XGENE_GPIO_PM_OPS,
},
.probe = xgene_gpio_probe,