Commit 4ec90ac5 authored by Richard Leitner's avatar Richard Leitner Committed by Dmitry Torokhov

Input: sx8654 - use common of_touchscreen functions

of_touchscreen.c provides a common interface for a axis inversion and
swapping of touchscreens. Therefore use it in the sx8654 driver.
Signed-off-by: default avatarRichard Leitner <richard.leitner@skidata.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 43df039c
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/input/touchscreen.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/module.h> #include <linux/module.h>
...@@ -102,6 +103,8 @@ struct sx8654 { ...@@ -102,6 +103,8 @@ struct sx8654 {
spinlock_t lock; /* for input reporting from irq/timer */ spinlock_t lock; /* for input reporting from irq/timer */
struct timer_list timer; struct timer_list timer;
struct touchscreen_properties props;
const struct sx865x_data *data; const struct sx865x_data *data;
}; };
...@@ -177,8 +180,7 @@ static irqreturn_t sx8650_irq(int irq, void *handle) ...@@ -177,8 +180,7 @@ static irqreturn_t sx8650_irq(int irq, void *handle)
chdata); chdata);
} }
input_report_abs(ts->input, ABS_X, x); touchscreen_report_pos(ts->input, &ts->props, x, y, false);
input_report_abs(ts->input, ABS_Y, y);
input_report_key(ts->input, BTN_TOUCH, 1); input_report_key(ts->input, BTN_TOUCH, 1);
input_sync(ts->input); input_sync(ts->input);
dev_dbg(dev, "point(%4d,%4d)\n", x, y); dev_dbg(dev, "point(%4d,%4d)\n", x, y);
...@@ -225,8 +227,8 @@ static irqreturn_t sx8654_irq(int irq, void *handle) ...@@ -225,8 +227,8 @@ static irqreturn_t sx8654_irq(int irq, void *handle)
x = ((data[0] & 0xf) << 8) | (data[1]); x = ((data[0] & 0xf) << 8) | (data[1]);
y = ((data[2] & 0xf) << 8) | (data[3]); y = ((data[2] & 0xf) << 8) | (data[3]);
input_report_abs(sx8654->input, ABS_X, x); touchscreen_report_pos(sx8654->input, &sx8654->props, x, y,
input_report_abs(sx8654->input, ABS_Y, y); false);
input_report_key(sx8654->input, BTN_TOUCH, 1); input_report_key(sx8654->input, BTN_TOUCH, 1);
input_sync(sx8654->input); input_sync(sx8654->input);
...@@ -361,6 +363,8 @@ static int sx8654_probe(struct i2c_client *client, ...@@ -361,6 +363,8 @@ static int sx8654_probe(struct i2c_client *client,
input_set_abs_params(input, ABS_X, 0, MAX_12BIT, 0, 0); input_set_abs_params(input, ABS_X, 0, MAX_12BIT, 0, 0);
input_set_abs_params(input, ABS_Y, 0, MAX_12BIT, 0, 0); input_set_abs_params(input, ABS_Y, 0, MAX_12BIT, 0, 0);
touchscreen_parse_properties(input, false, &sx8654->props);
sx8654->client = client; sx8654->client = client;
sx8654->input = input; sx8654->input = input;
......
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