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, linux-kernel@vger.kernel.org,
Maxime Ripard <maxime.ripard@free-electrons.com>
Subject: [PATCH 2/3] input: touchscreen: of: Register multitouch axes
Date: Wed, 5 Nov 2014 16:07:49 +0100 [thread overview]
Message-ID: <1415200070-19346-3-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1415200070-19346-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 | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/input/touchscreen/of_touchscreen.c b/drivers/input/touchscreen/of_touchscreen.c
index 74d6b0eb50ac..cf2a753edd96 100644
--- a/drivers/input/touchscreen/of_touchscreen.c
+++ b/drivers/input/touchscreen/of_touchscreen.c
@@ -42,17 +42,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) {
input_set_abs_params(dev, ABS_X, 0, maximum, fuzz, 0);
+ input_set_abs_params(dev, ABS_MT_POSITION_X, 0, maximum, fuzz, 0);
+ }
maximum = of_get_optional_u32(np, "touchscreen-size-y");
fuzz = of_get_optional_u32(np, "touchscreen-fuzz-y");
- if (maximum || fuzz)
+ if (maximum || fuzz) {
input_set_abs_params(dev, ABS_Y, 0, maximum, fuzz, 0);
+ input_set_abs_params(dev, ABS_MT_POSITION_Y, 0, maximum, fuzz, 0);
+ }
maximum = of_get_optional_u32(np, "touchscreen-max-pressure");
fuzz = of_get_optional_u32(np, "touchscreen-fuzz-pressure");
- if (maximum || fuzz)
+ if (maximum || fuzz) {
input_set_abs_params(dev, ABS_PRESSURE, 0, maximum, fuzz, 0);
+ input_set_abs_params(dev, ABS_MT_PRESSURE, 0, maximum, fuzz, 0);
+ }
}
EXPORT_SYMBOL(touchscreen_parse_of_params);
--
2.1.1
next prev parent reply other threads:[~2014-11-05 15:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-05 15:07 [PATCH 0/3] input: ft5x06: Fix userspace reported maximum value Maxime Ripard
2014-11-05 15:07 ` [PATCH 1/3] input: touchscreen: of: Use input_set_abs_params Maxime Ripard
2014-11-05 15:07 ` Maxime Ripard [this message]
2014-11-05 17:56 ` [PATCH 2/3] input: touchscreen: of: Register multitouch axes Dmitry Torokhov
2014-11-06 16:06 ` Maxime Ripard
2014-11-06 17:14 ` Dmitry Torokhov
2014-11-05 15:07 ` [PATCH 3/3] input: ft5x06: Allow to set the maximum axes value through the DT 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=1415200070-19346-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=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®