From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: "Lothar Waßmann" <LW@KARO-electronics.de>,
"Dmitry Torokhov" <dmitry.torokhov@gmail.com>,
"Henrik Rydberg" <rydberg@euromail.se>
Cc: linux-input@vger.kernel.org, Markus Pargmann <mpa@pengutronix.de>,
linux-kernel@vger.kernel.org,
Maxime Ripard <maxime.ripard@free-electrons.com>
Subject: [PATCH v3 2/4] input: touchscreen: of: Register multitouch axes
Date: Tue, 3 Mar 2015 14:50:44 +0100 [thread overview]
Message-ID: <1425390646-31196-3-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1425390646-31196-1-git-send-email-maxime.ripard@free-electrons.com>
So far, the DT parsing code was only setting up the regular input axes,
completely ignoring their multitouch counter parts.
Fill them with the same parameters than the regular axes.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/input/touchscreen/of_touchscreen.c | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/drivers/input/touchscreen/of_touchscreen.c b/drivers/input/touchscreen/of_touchscreen.c
index fe80d8ba7efa..b82b5207c78b 100644
--- a/drivers/input/touchscreen/of_touchscreen.c
+++ b/drivers/input/touchscreen/of_touchscreen.c
@@ -11,6 +11,7 @@
#include <linux/of.h>
#include <linux/input.h>
+#include <linux/input/mt.h>
#include <linux/input/touchscreen.h>
static u32 of_get_optional_u32(struct device_node *np,
@@ -30,8 +31,13 @@ static void touchscreen_set_params(struct input_dev *dev,
struct input_absinfo *absinfo;
if (!test_bit(axis, dev->absbit)) {
- dev_warn(&dev->dev,
- "DT specifies parameters but the axis is not set up\n");
+ /*
+ * Emit a warning only if the axis is not a multitouch
+ * axis, which might not be set by the driver.
+ */
+ if (!input_is_mt_axis(axis))
+ dev_warn(&dev->dev,
+ "DT specifies parameters but the axis is not set up\n");
return;
}
@@ -59,17 +65,23 @@ void touchscreen_parse_of_params(struct input_dev *dev)
maximum = of_get_optional_u32(np, "touchscreen-size-x");
fuzz = of_get_optional_u32(np, "touchscreen-fuzz-x");
- if (maximum || fuzz)
+ if (maximum || fuzz) {
touchscreen_set_params(dev, ABS_X, maximum, fuzz);
+ touchscreen_set_params(dev, ABS_MT_POSITION_X, maximum, fuzz);
+ }
maximum = of_get_optional_u32(np, "touchscreen-size-y");
fuzz = of_get_optional_u32(np, "touchscreen-fuzz-y");
- if (maximum || fuzz)
+ if (maximum || fuzz) {
touchscreen_set_params(dev, ABS_Y, maximum, fuzz);
+ touchscreen_set_params(dev, ABS_MT_POSITION_Y, maximum, fuzz);
+ }
maximum = of_get_optional_u32(np, "touchscreen-max-pressure");
fuzz = of_get_optional_u32(np, "touchscreen-fuzz-pressure");
- if (maximum || fuzz)
+ if (maximum || fuzz) {
touchscreen_set_params(dev, ABS_PRESSURE, maximum, fuzz);
+ touchscreen_set_params(dev, ABS_MT_PRESSURE, maximum, fuzz);
+ }
}
EXPORT_SYMBOL(touchscreen_parse_of_params);
--
2.3.0
next prev parent reply other threads:[~2015-03-03 13:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-03 13:50 [PATCH v3 0/4] input: ft5x06: Fix userspace reported maximum value Maxime Ripard
2015-03-03 13:50 ` [PATCH v3 1/4] input: touchscreen: of: Use input_set_abs_params Maxime Ripard
2015-03-03 13:50 ` Maxime Ripard [this message]
2015-03-03 13:50 ` [PATCH v3 3/4] input: ft5x06: Allow to set the maximum axes value through the DT Maxime Ripard
2015-03-03 13:50 ` [PATCH v3 4/4] input: edt-ft5x06: Remove EV_SYN event report Maxime Ripard
2015-03-12 14:30 ` [PATCH v3 0/4] input: ft5x06: Fix userspace reported maximum value Markus Pargmann
2015-03-24 0:10 ` Maxime Ripard
2015-03-24 16:47 ` Dmitry Torokhov
2015-03-24 18:45 ` Maxime Ripard
2015-03-24 18:56 ` Dmitry Torokhov
2015-03-24 19:05 ` Maxime Ripard
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=1425390646-31196-3-git-send-email-maxime.ripard@free-electrons.com \
--to=maxime.ripard@free-electrons.com \
--cc=LW@KARO-electronics.de \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mpa@pengutronix.de \
--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®