diff options
| author | Walter Goossens <waltergoossens@home.nl> | 2011-02-14 10:06:42 +0800 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-15 21:39:21 -0700 |
| commit | 0bfd95a2a104dfc2469d68de52df99939371c0d4 (patch) | |
| tree | 2e1a05d7652182af240525b74b584368da2e27f0 /drivers/input/serio/altera_ps2.c | |
| parent | b5d937de0367d26f65b9af1aef5f2c34c1939be0 (diff) | |
| download | linux-0bfd95a2a104dfc2469d68de52df99939371c0d4.tar.bz2 | |
altera_ps2: Add devicetree support
Add match table for device tree binding.
v2: use const and add compat version.
v3: change compatible vendor to ALTR.
add dts binding doc.
v4: condition module device table export for of.
Signed-off-by: Walter Goossens <waltergoossens@home.nl>
Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
[dustan.bower@gmail.com: fixed missing semicolon]
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/input/serio/altera_ps2.c')
| -rw-r--r-- | drivers/input/serio/altera_ps2.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c index 7998560a1904..d363dc4571a3 100644 --- a/drivers/input/serio/altera_ps2.c +++ b/drivers/input/serio/altera_ps2.c @@ -19,6 +19,7 @@ #include <linux/platform_device.h> #include <linux/io.h> #include <linux/slab.h> +#include <linux/of.h> #define DRV_NAME "altera_ps2" @@ -173,6 +174,16 @@ static int __devexit altera_ps2_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF +static const struct of_device_id altera_ps2_match[] = { + { .compatible = "ALTR,ps2-1.0", }, + {}, +}; +MODULE_DEVICE_TABLE(of, altera_ps2_match); +#else /* CONFIG_OF */ +#define altera_ps2_match NULL +#endif /* CONFIG_OF */ + /* * Our device driver structure */ @@ -182,6 +193,7 @@ static struct platform_driver altera_ps2_driver = { .driver = { .name = DRV_NAME, .owner = THIS_MODULE, + .of_match_table = altera_ps2_match, }, }; @@ -189,13 +201,12 @@ static int __init altera_ps2_init(void) { return platform_driver_register(&altera_ps2_driver); } +module_init(altera_ps2_init); static void __exit altera_ps2_exit(void) { platform_driver_unregister(&altera_ps2_driver); } - -module_init(altera_ps2_init); module_exit(altera_ps2_exit); MODULE_DESCRIPTION("Altera University Program PS2 controller driver"); |