diff options
| author |   Mischa Jonker <Mischa.Jonker@synopsys.com> | 2013-03-31 00:25:33 -0700 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-03-31 00:48:14 -0700 |
| commit | 2c0a4f8b870dbeb48e3351899bd0e0cc886d4985 (patch) | |
| tree | c3772172a2e62ad446b4ce3d3b6cc0da73968e81 | |
| parent | Input: mma8450 - fix signed 12bits to 32bits conversion (diff) | |
| download | linux-dev-2c0a4f8b870dbeb48e3351899bd0e0cc886d4985.tar.xz linux-dev-2c0a4f8b870dbeb48e3351899bd0e0cc886d4985.zip | |
Input: arc_ps2 - add support for device tree
Add match table for device tree binding and dts binding doc.
Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| -rw-r--r-- | Documentation/devicetree/bindings/serio/snps-arc_ps2.txt | 16 | ||||
| -rw-r--r-- | drivers/input/serio/arc_ps2.c | 14 |
2 files changed, 28 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/serio/snps-arc_ps2.txt b/Documentation/devicetree/bindings/serio/snps-arc_ps2.txt new file mode 100644 index 000000000000..38c2f21e8044 --- /dev/null +++ b/Documentation/devicetree/bindings/serio/snps-arc_ps2.txt @@ -0,0 +1,16 @@ +* ARC PS/2 driver: PS/2 block used in some ARC FPGA's & nSIM OSCI model + +Required properties: +- compatible : "snps,arc_ps2" +- reg : offset and length (always 0x14) of registers +- interrupts : interrupt +- interrupt-names : name of interrupt, must be "arc_ps2_irq" + +Example: + +serio@c9000400 { + compatible = "snps,arc_ps2"; + reg = <0xc9000400 0x14>; + interrupts = <13>; + interrupt-names = "arc_ps2_irq"; +} diff --git a/drivers/input/serio/arc_ps2.c b/drivers/input/serio/arc_ps2.c index c52e3e589f72..3fb7727c8ea5 100644 --- a/drivers/input/serio/arc_ps2.c +++ b/drivers/input/serio/arc_ps2.c @@ -14,6 +14,7 @@ #include <linux/input.h> #include <linux/serio.h> #include <linux/platform_device.h> +#include <linux/of.h> #include <linux/io.h> #include <linux/kernel.h> #include <linux/slab.h> @@ -259,10 +260,19 @@ static int arc_ps2_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF +static const struct of_device_id arc_ps2_match[] = { + { .compatible = "snps,arc_ps2" }, + { }, +}; +MODULE_DEVICE_TABLE(of, arc_ps2_match); +#endif + static struct platform_driver arc_ps2_driver = { .driver = { - .name = "arc_ps2", - .owner = THIS_MODULE, + .name = "arc_ps2", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(arc_ps2_match), }, .probe = arc_ps2_probe, .remove = arc_ps2_remove, |