Commit 888e5fad authored by Stefan Riedmueller's avatar Stefan Riedmueller Committed by Dmitry Torokhov

Input: stmpe - add axis inversion and swapping capability

Make use of generic touchscreen_properties structure to add axis
inversion and swapping capabilities. It's configurable via devicetree
properties:
  touchscreen-inverted-x
  touchscreen-inverted-y
  touchscreen-swapped-x-y
Signed-off-by: default avatarStefan Riedmueller <s.riedmueller@phytec.de>
Link: https://lore.kernel.org/r/20200922093903.157232-1-s.riedmueller@phytec.deSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 51a224ea
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/input/touchscreen.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/i2c.h> #include <linux/i2c.h>
...@@ -72,6 +73,7 @@ struct stmpe_touch { ...@@ -72,6 +73,7 @@ struct stmpe_touch {
struct input_dev *idev; struct input_dev *idev;
struct delayed_work work; struct delayed_work work;
struct device *dev; struct device *dev;
struct touchscreen_properties prop;
u8 ave_ctrl; u8 ave_ctrl;
u8 touch_det_delay; u8 touch_det_delay;
u8 settling; u8 settling;
...@@ -150,8 +152,7 @@ static irqreturn_t stmpe_ts_handler(int irq, void *data) ...@@ -150,8 +152,7 @@ static irqreturn_t stmpe_ts_handler(int irq, void *data)
y = ((data_set[1] & 0xf) << 8) | data_set[2]; y = ((data_set[1] & 0xf) << 8) | data_set[2];
z = data_set[3]; z = data_set[3];
input_report_abs(ts->idev, ABS_X, x); touchscreen_report_pos(ts->idev, &ts->prop, x, y, false);
input_report_abs(ts->idev, ABS_Y, y);
input_report_abs(ts->idev, ABS_PRESSURE, z); input_report_abs(ts->idev, ABS_PRESSURE, z);
input_report_key(ts->idev, BTN_TOUCH, 1); input_report_key(ts->idev, BTN_TOUCH, 1);
input_sync(ts->idev); input_sync(ts->idev);
...@@ -337,6 +338,8 @@ static int stmpe_input_probe(struct platform_device *pdev) ...@@ -337,6 +338,8 @@ static int stmpe_input_probe(struct platform_device *pdev)
input_set_abs_params(idev, ABS_Y, 0, XY_MASK, 0, 0); input_set_abs_params(idev, ABS_Y, 0, XY_MASK, 0, 0);
input_set_abs_params(idev, ABS_PRESSURE, 0x0, 0xff, 0, 0); input_set_abs_params(idev, ABS_PRESSURE, 0x0, 0xff, 0, 0);
touchscreen_parse_properties(idev, false, &ts->prop);
error = input_register_device(idev); error = input_register_device(idev);
if (error) { if (error) {
dev_err(&pdev->dev, "Could not register input device\n"); dev_err(&pdev->dev, "Could not register input device\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment