From: Daniel Kurtz <djkurtz@chromium.org>
To: Alessandro Rubini <rubini@cvml.unipv.it>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Henrik Rydberg <rydberg@euromail.se>
Cc: Olof Johansson <olof@lixom.net>,
Benson Leung <bleung@chromium.org>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
Daniel Kurtz <djkurtz@chromium.org>
Subject: [PATCH 2/2] Input: synaptics - add sysfs access to firmware ID & board ID
Date: Thu, 28 Jun 2012 12:51:57 +0800 [thread overview]
Message-ID: <1340859117-19654-2-git-send-email-djkurtz@chromium.org> (raw)
In-Reply-To: <1340859117-19654-1-git-send-email-djkurtz@chromium.org>
Allow userspace to query firmware ID and board ID, which are read and
cached during device initialization.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
---
drivers/input/mouse/synaptics.c | 41 +++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 81685c1..985d550 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -1258,6 +1258,17 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)
}
}
+/*****************************************************************************
+ * sysfs interface
+ ****************************************************************************/
+/* Sysfs entry for board ID */
+static ssize_t synaptics_show_board_id(struct psmouse *psmouse, void *data,
+ char *buf)
+{
+ struct synaptics_data *priv = psmouse->private;
+ return scnprintf(buf, PAGE_SIZE, "%lu\n", priv->board_id);
+}
+
static ssize_t synaptics_show_disable_gesture(struct psmouse *psmouse,
void *data, char *buf)
{
@@ -1296,9 +1307,30 @@ static ssize_t synaptics_set_disable_gesture(struct psmouse *psmouse,
return len;
}
+/* Sysfs entry for firmware ID */
+static ssize_t synaptics_show_firmware_id(struct psmouse *psmouse, void *data,
+ char *buf)
+{
+ struct synaptics_data *priv = psmouse->private;
+ return scnprintf(buf, PAGE_SIZE, "%lu\n", priv->firmware_id);
+}
+
+PSMOUSE_DEFINE_RO_ATTR(board_id, S_IRUGO, NULL, synaptics_show_board_id);
PSMOUSE_DEFINE_ATTR(disable_gesture, S_IWUSR | S_IRUGO, NULL,
synaptics_show_disable_gesture,
synaptics_set_disable_gesture);
+PSMOUSE_DEFINE_RO_ATTR(firmware_id, S_IRUGO, NULL, synaptics_show_firmware_id);
+
+static struct attribute *synaptics_attrs[] = {
+ &psmouse_attr_board_id.dattr.attr,
+ &psmouse_attr_firmware_id.dattr.attr,
+ NULL
+};
+
+static struct attribute_group synaptics_attr_group = {
+ .attrs = synaptics_attrs,
+};
+
static void synaptics_disconnect(struct psmouse *psmouse)
{
@@ -1308,6 +1340,9 @@ static void synaptics_disconnect(struct psmouse *psmouse)
device_remove_file(&psmouse->ps2dev.serio->dev,
&psmouse_attr_disable_gesture.dattr);
+ sysfs_remove_group(&psmouse->ps2dev.serio->dev.kobj,
+ &synaptics_attr_group);
+
synaptics_reset(psmouse);
kfree(priv);
psmouse->private = NULL;
@@ -1528,6 +1563,12 @@ static int __synaptics_init(struct psmouse *psmouse, bool absolute_mode)
}
}
+ err = sysfs_create_group(&psmouse->ps2dev.serio->dev.kobj,
+ &synaptics_attr_group);
+ if (err)
+ psmouse_warn(psmouse,
+ "Failed to create sysfs attributes (%d)", err);
+
return 0;
init_fail:
--
1.7.7.3
next prev parent reply other threads:[~2012-06-28 4:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-28 4:51 [PATCH 1/2] Input: synaptics - print firmware ID and board number at init Daniel Kurtz
2012-06-28 4:51 ` Daniel Kurtz [this message]
2012-07-02 7:36 ` [PATCH 2/2] Input: synaptics - add sysfs access to firmware ID & board ID Henrik Rydberg
2012-07-02 7:27 ` [PATCH 1/2] Input: synaptics - print firmware ID and board number at init Henrik Rydberg
2012-07-02 11:17 ` Daniel Kurtz
2012-07-02 12:37 ` Henrik Rydberg
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=1340859117-19654-2-git-send-email-djkurtz@chromium.org \
--to=djkurtz@chromium.org \
--cc=bleung@chromium.org \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=olof@lixom.net \
--cc=rubini@cvml.unipv.it \
--cc=rydberg@euromail.se \
/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
all inboxes | Powered by JetHome®