diff options
author | Duc Dang <dhdang@apm.com> | 2016-04-30 16:49:27 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2016-05-01 04:23:12 -0400 |
commit | 0c60de3f73cddde6a83979c64f63cb1101f5326c (patch) | |
tree | 37f725dff459a5b8e3442c3b1b941424d5789ef6 | |
parent | f002d07c56c7b7007328e8fff2adf04db1c81e90 (diff) |
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>
-rw-r--r-- | drivers/gpio/gpio-xgene.c | 9 |
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 @@ | |||
17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/acpi.h> | ||
20 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
21 | #include <linux/init.h> | 22 | #include <linux/init.h> |
22 | #include <linux/io.h> | 23 | #include <linux/io.h> |
@@ -211,10 +212,18 @@ static const struct of_device_id xgene_gpio_of_match[] = { | |||
211 | {}, | 212 | {}, |
212 | }; | 213 | }; |
213 | 214 | ||
215 | #ifdef CONFIG_ACPI | ||
216 | static const struct acpi_device_id xgene_gpio_acpi_match[] = { | ||
217 | { "APMC0D14", 0 }, | ||
218 | { }, | ||
219 | }; | ||
220 | #endif | ||
221 | |||
214 | static struct platform_driver xgene_gpio_driver = { | 222 | static struct platform_driver xgene_gpio_driver = { |
215 | .driver = { | 223 | .driver = { |
216 | .name = "xgene-gpio", | 224 | .name = "xgene-gpio", |
217 | .of_match_table = xgene_gpio_of_match, | 225 | .of_match_table = xgene_gpio_of_match, |
226 | .acpi_match_table = ACPI_PTR(xgene_gpio_acpi_match), | ||
218 | .pm = XGENE_GPIO_PM_OPS, | 227 | .pm = XGENE_GPIO_PM_OPS, |
219 | }, | 228 | }, |
220 | .probe = xgene_gpio_probe, | 229 | .probe = xgene_gpio_probe, |