diff options
| author | Lee Jones <lee.jones@linaro.org> | 2012-06-12 03:21:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-06-12 03:39:47 -0400 |
| commit | 03ecd229a5d05a5c62e7262d66ec6cd57d5eca6c (patch) | |
| tree | 2fc0f39c4f9cff0e704c65549fc231ab6f5b1bc0 /drivers/input/misc | |
| parent | 4eceb14f669cb9e9d189019e8fcbf73577fe77a7 (diff) | |
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')
| -rw-r--r-- | drivers/input/misc/ab8500-ponkey.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/input/misc/ab8500-ponkey.c b/drivers/input/misc/ab8500-ponkey.c index 350fd0c385d..84ec691c05a 100644 --- a/drivers/input/misc/ab8500-ponkey.c +++ b/drivers/input/misc/ab8500-ponkey.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/input.h> | 13 | #include <linux/input.h> |
| 14 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 15 | #include <linux/mfd/abx500/ab8500.h> | 15 | #include <linux/mfd/abx500/ab8500.h> |
| 16 | #include <linux/of.h> | ||
| 16 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
| 17 | 18 | ||
| 18 | /** | 19 | /** |
| @@ -131,10 +132,18 @@ static int __devexit ab8500_ponkey_remove(struct platform_device *pdev) | |||
| 131 | return 0; | 132 | return 0; |
| 132 | } | 133 | } |
| 133 | 134 | ||
| 135 | #ifdef CONFIG_OF | ||
| 136 | static const struct of_device_id ab8500_ponkey_match[] = { | ||
| 137 | { .compatible = "stericsson,ab8500-ponkey", }, | ||
| 138 | {} | ||
| 139 | }; | ||
| 140 | #endif | ||
| 141 | |||
| 134 | static struct platform_driver ab8500_ponkey_driver = { | 142 | static struct platform_driver ab8500_ponkey_driver = { |
| 135 | .driver = { | 143 | .driver = { |
| 136 | .name = "ab8500-poweron-key", | 144 | .name = "ab8500-poweron-key", |
| 137 | .owner = THIS_MODULE, | 145 | .owner = THIS_MODULE, |
| 146 | .of_match_table = of_match_ptr(ab8500_ponkey_match), | ||
| 138 | }, | 147 | }, |
| 139 | .probe = ab8500_ponkey_probe, | 148 | .probe = ab8500_ponkey_probe, |
| 140 | .remove = __devexit_p(ab8500_ponkey_remove), | 149 | .remove = __devexit_p(ab8500_ponkey_remove), |
