mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
Input: mms114 - support MMS134S
The MMS134S like the MMS136 has an event size of 6 bytes. After this patch, the touchscreen on the Samsung SGH-I407 works fine with PostmarketOS. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20210706235951.189289-1-linus.walleij@linaro.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
parent
d198b8273e
commit
ab10867819
1 changed files with 11 additions and 4 deletions
|
@ -54,6 +54,7 @@
|
||||||
|
|
||||||
enum mms_type {
|
enum mms_type {
|
||||||
TYPE_MMS114 = 114,
|
TYPE_MMS114 = 114,
|
||||||
|
TYPE_MMS134S = 134,
|
||||||
TYPE_MMS136 = 136,
|
TYPE_MMS136 = 136,
|
||||||
TYPE_MMS152 = 152,
|
TYPE_MMS152 = 152,
|
||||||
TYPE_MMS345L = 345,
|
TYPE_MMS345L = 345,
|
||||||
|
@ -212,7 +213,7 @@ static irqreturn_t mms114_interrupt(int irq, void *dev_id)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
/* MMS136 has slightly different event size */
|
/* MMS136 has slightly different event size */
|
||||||
if (data->type == TYPE_MMS136)
|
if (data->type == TYPE_MMS134S || data->type == TYPE_MMS136)
|
||||||
touch_size = packet_size / MMS136_EVENT_SIZE;
|
touch_size = packet_size / MMS136_EVENT_SIZE;
|
||||||
else
|
else
|
||||||
touch_size = packet_size / MMS114_EVENT_SIZE;
|
touch_size = packet_size / MMS114_EVENT_SIZE;
|
||||||
|
@ -281,6 +282,7 @@ static int mms114_get_version(struct mms114_data *data)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TYPE_MMS114:
|
case TYPE_MMS114:
|
||||||
|
case TYPE_MMS134S:
|
||||||
case TYPE_MMS136:
|
case TYPE_MMS136:
|
||||||
error = __mms114_read_reg(data, MMS114_TSP_REV, 6, buf);
|
error = __mms114_read_reg(data, MMS114_TSP_REV, 6, buf);
|
||||||
if (error)
|
if (error)
|
||||||
|
@ -304,8 +306,9 @@ static int mms114_setup_regs(struct mms114_data *data)
|
||||||
if (error < 0)
|
if (error < 0)
|
||||||
return error;
|
return error;
|
||||||
|
|
||||||
/* Only MMS114 and MMS136 have configuration and power on registers */
|
/* MMS114, MMS134S and MMS136 have configuration and power on registers */
|
||||||
if (data->type != TYPE_MMS114 && data->type != TYPE_MMS136)
|
if (data->type != TYPE_MMS114 && data->type != TYPE_MMS134S &&
|
||||||
|
data->type != TYPE_MMS136)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
error = mms114_set_active(data, true);
|
error = mms114_set_active(data, true);
|
||||||
|
@ -487,7 +490,8 @@ static int mms114_probe(struct i2c_client *client,
|
||||||
0, data->props.max_y, 0, 0);
|
0, data->props.max_y, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data->type == TYPE_MMS114 || data->type == TYPE_MMS136) {
|
if (data->type == TYPE_MMS114 || data->type == TYPE_MMS134S ||
|
||||||
|
data->type == TYPE_MMS136) {
|
||||||
/*
|
/*
|
||||||
* The firmware handles movement and pressure fuzz, so
|
* The firmware handles movement and pressure fuzz, so
|
||||||
* don't duplicate that in software.
|
* don't duplicate that in software.
|
||||||
|
@ -611,6 +615,9 @@ static const struct of_device_id mms114_dt_match[] = {
|
||||||
{
|
{
|
||||||
.compatible = "melfas,mms114",
|
.compatible = "melfas,mms114",
|
||||||
.data = (void *)TYPE_MMS114,
|
.data = (void *)TYPE_MMS114,
|
||||||
|
}, {
|
||||||
|
.compatible = "melfas,mms134s",
|
||||||
|
.data = (void *)TYPE_MMS134S,
|
||||||
}, {
|
}, {
|
||||||
.compatible = "melfas,mms136",
|
.compatible = "melfas,mms136",
|
||||||
.data = (void *)TYPE_MMS136,
|
.data = (void *)TYPE_MMS136,
|
||||||
|
|
Loading…
Reference in a new issue