aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc/ab8500-ponkey.c
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-06-12 00:21:47 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-06-12 00:39:47 -0700
commit03ecd229a5d05a5c62e7262d66ec6cd57d5eca6c (patch)
tree2fc0f39c4f9cff0e704c65549fc231ab6f5b1bc0 /drivers/input/misc/ab8500-ponkey.c
parentInput: gpio_keys - remove useless reinitialization of pdata->nbuttons (diff)
downloadlinux-dev-03ecd229a5d05a5c62e7262d66ec6cd57d5eca6c.tar.xz
linux-dev-03ecd229a5d05a5c62e7262d66ec6cd57d5eca6c.zip
Input: ab8500-ponkey - add device tree support
Allow the ab8500-ponkey driver to be probed during boot when Device Tree is enabled. Signed-off-by: Lee Jones <lee.jones@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/misc/ab8500-ponkey.c')
-rw-r--r--drivers/input/misc/ab8500-ponkey.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/input/misc/ab8500-ponkey.c b/drivers/input/misc/ab8500-ponkey.c
index 350fd0c385d2..84ec691c05aa 100644
--- a/drivers/input/misc/ab8500-ponkey.c
+++ b/drivers/input/misc/ab8500-ponkey.c
@@ -13,6 +13,7 @@
#include <linux/input.h>
#include <linux/interrupt.h>
#include <linux/mfd/abx500/ab8500.h>
+#include <linux/of.h>
#include <linux/slab.h>
/**
@@ -131,10 +132,18 @@ static int __devexit ab8500_ponkey_remove(struct platform_device *pdev)
return 0;
}
+#ifdef CONFIG_OF
+static const struct of_device_id ab8500_ponkey_match[] = {
+ { .compatible = "stericsson,ab8500-ponkey", },
+ {}
+};
+#endif
+
static struct platform_driver ab8500_ponkey_driver = {
.driver = {
.name = "ab8500-poweron-key",
.owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(ab8500_ponkey_match),
},
.probe = ab8500_ponkey_probe,
.remove = __devexit_p(ab8500_ponkey_remove),