linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Chou <thomas-SDxUXYEhEBiCuPEqFHbRBg@public.gmane.org>
To: Grant Likely
	<grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>,
	Dmitry Torokhov
	<dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: nios2-dev-1eJk0qcHJCcaeqlQEoCUNoJY59XmG8rH@public.gmane.org,
	devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH v3] altera_ps2: Add devicetree support
Date: Thu,  3 Feb 2011 11:05:04 +0800	[thread overview]
Message-ID: <1296702304-30471-1-git-send-email-thomas@wytron.com.tw> (raw)
In-Reply-To: <AANLkTikxSrwOfU=m_h+6G5hQMk6drOpqOPSfbBdzg53g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>

Signed-off-by: Walter Goossens <waltergoossens-CmkmPbn3yAE@public.gmane.org>
Signed-off-by: Thomas Chou <thomas-SDxUXYEhEBiCuPEqFHbRBg@public.gmane.org>
---
v2 use const and add compat version.
v3 change compatible vendor to ALTR.
   add dts binding doc.

 .../devicetree/bindings/serio/altera_ps2.txt       |    4 ++++
 drivers/input/serio/altera_ps2.c                   |   11 +++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/serio/altera_ps2.txt

diff --git a/Documentation/devicetree/bindings/serio/altera_ps2.txt b/Documentation/devicetree/bindings/serio/altera_ps2.txt
new file mode 100644
index 0000000..4d9eecc
--- /dev/null
+++ b/Documentation/devicetree/bindings/serio/altera_ps2.txt
@@ -0,0 +1,4 @@
+Altera UP PS/2 controller
+
+Required properties:
+- compatible : should be "ALTR,ps2-1.0".
diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c
index 7998560..d94b4a3 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,12 @@ static int __devexit altera_ps2_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static const struct of_device_id altera_ps2_match[] = {
+	{ .compatible = "ALTR,ps2-1.0", },
+	{},
+}
+MODULE_DEVICE_TABLE(of, altera_ps2_match);
+
 /*
  * Our device driver structure
  */
@@ -182,6 +189,7 @@ static struct platform_driver altera_ps2_driver = {
 	.driver	= {
 		.name	= DRV_NAME,
 		.owner	= THIS_MODULE,
+		.of_match_table = altera_ps2_match,
 	},
 };
 
@@ -189,13 +197,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");
-- 
1.7.3.5

  parent reply	other threads:[~2011-02-03  3:05 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <4D040D1C.2020705@home.nl>
     [not found] ` <4D040D1C.2020705-CmkmPbn3yAE@public.gmane.org>
2011-01-17  6:29   ` [PATCH] alter_ps2: Add devicetree support Thomas Chou
2011-01-17  6:59     ` Grant Likely
     [not found]       ` <AANLkTi=8+Q5dm+5Pa-cYkmaBWQ4S7jgjZOL0ovtmrdxB-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-01-17 21:04         ` Walter Goossens
2011-01-17 22:02           ` Grant Likely
2011-01-17 23:27             ` Walter Goossens
2011-01-18 14:26               ` Thomas Chou
2011-01-17 21:31     ` Dmitry Torokhov
     [not found]       ` <20110117213100.GC27245-WlK9ik9hQGAhIp7JRqBPierSzoNAToWh@public.gmane.org>
2011-01-17 22:04         ` Grant Likely
2011-01-24  5:58           ` [PATCH v2] altera_ps2: " Thomas Chou
2011-02-02  4:31             ` Grant Likely
2011-02-02  4:36               ` Grant Likely
     [not found]                 ` <AANLkTikxSrwOfU=m_h+6G5hQMk6drOpqOPSfbBdzg53g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-02-03  3:05                   ` Thomas Chou [this message]
2011-02-12  9:26                     ` [PATCH v3] " Grant Likely
2011-02-12 13:23                       ` Thomas Chou
2011-02-14  2:06                       ` [PATCH v4] " Thomas Chou
2011-02-14  2:20                         ` Dmitry Torokhov
2011-02-16  4:40                         ` Grant Likely
     [not found]               ` <20110202043121.GF29148-MrY2KI0G/OVr83L8+7iqerDks+cytr/Z@public.gmane.org>
2011-02-02  4:45                 ` [PATCH v2] " Dmitry Torokhov
2011-02-02 11:48               ` Thomas Chou
2011-02-02 12:11                 ` [Nios2-dev] " Tobias Klauser
2011-02-02 15:38                 ` Grant Likely
     [not found]                   ` <20110202153803.GC20275-MrY2KI0G/OVr83L8+7iqerDks+cytr/Z@public.gmane.org>
2011-02-02 23:32                     ` Thomas Chou
2011-02-02 15:39                 ` Grant Likely
2011-02-02 23:35                   ` Thomas Chou
     [not found]                   ` <20110202153959.GD20275-MrY2KI0G/OVr83L8+7iqerDks+cytr/Z@public.gmane.org>
2011-02-03 22:27                     ` Walter Goossens
     [not found]                       ` <4D4B2BC9.1030000-CmkmPbn3yAE@public.gmane.org>
2011-02-03 22:53                         ` Mitch Bradley
2011-02-03 23:02                           ` Walter Goossens

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1296702304-30471-1-git-send-email-thomas@wytron.com.tw \
    --to=thomas-sdxuxyehebicupeqfhbrbg@public.gmane.org \
    --cc=devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \
    --cc=dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    --cc=grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org \
    --cc=linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=nios2-dev-1eJk0qcHJCcaeqlQEoCUNoJY59XmG8rH@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).