linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Input: arc_ps2 - add support for device tree
@ 2013-03-28  9:46 Mischa Jonker
  2013-03-31  7:29 ` Dmitry Torokhov
  0 siblings, 1 reply; 2+ messages in thread
From: Mischa Jonker @ 2013-03-28  9:46 UTC (permalink / raw)
  To: Grant Likely, Dmitry Torokhov, devicetree-discuss, linux-doc,
	linux-input, linux-kernel, arc-linux-dev, Vineet.Gupta1
  Cc: Mischa Jonker

Add match table for device tree binding and dts binding doc.

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
---
 .../devicetree/bindings/serio/snps-arc_ps2.txt     |   16 ++++++++++++++++
 drivers/input/serio/arc_ps2.c                      |   14 ++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/serio/snps-arc_ps2.txt

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 0000000..38c2f21
--- /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 c52e3e5..76a685d 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,
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] Input: arc_ps2 - add support for device tree
  2013-03-28  9:46 [PATCH] Input: arc_ps2 - add support for device tree Mischa Jonker
@ 2013-03-31  7:29 ` Dmitry Torokhov
  0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2013-03-31  7:29 UTC (permalink / raw)
  To: Mischa Jonker
  Cc: Grant Likely, devicetree-discuss, linux-doc, linux-input,
	linux-kernel, arc-linux-dev, Vineet.Gupta1

On Thu, Mar 28, 2013 at 10:46:26AM +0100, Mischa Jonker wrote:
> Add match table for device tree binding and dts binding doc.
> 
> Signed-off-by: Mischa Jonker <mjonker@synopsys.com>

Applied, thank you Mischa.

-- 
Dmitry

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-03-31  7:29 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-28  9:46 [PATCH] Input: arc_ps2 - add support for device tree Mischa Jonker
2013-03-31  7:29 ` Dmitry Torokhov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).