Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72b0c0cf authored by Simon Shields's avatar Simon Shields Committed by Dmitry Torokhov
Browse files

Input: mms114 - add support for mms152 



MMS152 has no configuration registers, but the packet format used in
interrupts is identical to mms114.

Signed-off-by: default avatarSimon Shields <simon@lineageos.org>
Reviewed-by: default avatarAndi Shyti <andi.shyti@samsung.com>
Tested-by: default avatarAndi Shyti <andi.shyti@samsung.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 5b0d0033

Documentation/devicetree/bindings/input/touchscreen/mms114.txt

+4 −2
Original line number Diff line number Diff line 
* MELFAS MMS114 touchscreen controller

* MELFAS MMS114/MMS152 touchscreen controller



Required properties:

- compatible: must be "melfas,mms114"

- compatible: should be one of:

	- "melfas,mms114"

	- "melfas,mms152"

- reg: I2C address of the chip

- interrupts: interrupt to which the chip is connected

- touchscreen-size-x: See [1]

drivers/input/touchscreen/mms114.c

+73 −19
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/module.h>

#include <linux/delay.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/i2c.h>

#include <linux/input/mt.h>

#include <linux/input/touchscreen.h>
@@ -33,6 +34,9 @@ 
#define MMS114_INFOMATION		0x10

#define MMS114_TSP_REV			0xF0



#define MMS152_FW_REV			0xE1

#define MMS152_COMPAT_GROUP		0xF2



/* Minimum delay time is 50us between stop and start signal of i2c */

#define MMS114_I2C_DELAY		50
@@ -50,12 +54,18 @@ 
#define MMS114_TYPE_TOUCHSCREEN		1

#define MMS114_TYPE_TOUCHKEY		2



enum mms_type {

	TYPE_MMS114	= 114,

	TYPE_MMS152	= 152,

};



struct mms114_data {

	struct i2c_client	*client;

	struct input_dev	*input_dev;

	struct regulator	*core_reg;

	struct regulator	*io_reg;

	struct touchscreen_properties props;

	enum mms_type		type;

	unsigned int		contact_threshold;

	unsigned int		moving_threshold;
@@ -239,14 +249,33 @@ static int mms114_get_version(struct mms114_data *data) 
{

	struct device *dev = &data->client->dev;

	u8 buf[6];

	int group;

	int error;



	switch (data->type) {

	case TYPE_MMS152:

		error = __mms114_read_reg(data, MMS152_FW_REV, 3, buf);

		if (error)

			return error;



		group = i2c_smbus_read_byte_data(data->client,

						  MMS152_COMPAT_GROUP);

		if (group < 0)

			return group;



		dev_info(dev, "TSP FW Rev: bootloader 0x%x / core 0x%x / config 0x%x, Compat group: %c\n",

			 buf[0], buf[1], buf[2], group);

		break;



	case TYPE_MMS114:

		error = __mms114_read_reg(data, MMS114_TSP_REV, 6, buf);

	if (error < 0)

		if (error)

			return error;



		dev_info(dev, "TSP Rev: 0x%x, HW Rev: 0x%x, Firmware Ver: 0x%x\n",

			 buf[0], buf[1], buf[3]);

		break;

	}



	return 0;

}
@@ -261,6 +290,10 @@ static int mms114_setup_regs(struct mms114_data *data) 
	if (error < 0)

		return error;



	/* MMS152 has no configuration or power on registers */

	if (data->type == TYPE_MMS152)

		return 0;



	error = mms114_set_active(data, true);

	if (error < 0)

		return error;
@@ -395,6 +428,7 @@ static int mms114_probe(struct i2c_client *client, 
{

	struct mms114_data *data;

	struct input_dev *input_dev;

	const void *match_data;

	int error;



	if (!i2c_check_functionality(client->adapter,
@@ -415,6 +449,13 @@ static int mms114_probe(struct i2c_client *client, 
	data->client = client;

	data->input_dev = input_dev;



	/* FIXME: switch to device_get_match_data() when available */

	match_data = of_device_get_match_data(&client->dev);

	if (!match_data)

		return -EINVAL;



	data->type = (enum mms_type)match_data;



	input_set_capability(input_dev, EV_ABS, ABS_MT_POSITION_X);

	input_set_capability(input_dev, EV_ABS, ABS_MT_POSITION_Y);

	input_set_abs_params(input_dev, ABS_MT_PRESSURE, 0, 255, 0, 0);
@@ -435,6 +476,7 @@ static int mms114_probe(struct i2c_client *client, 
				     0, data->props.max_y, 0, 0);

	}



	if (data->type == TYPE_MMS114) {

		/*

		 * The firmware handles movement and pressure fuzz, so

		 * don't duplicate that in software.
@@ -446,8 +488,14 @@ static int mms114_probe(struct i2c_client *client, 
		input_abs_set_fuzz(input_dev, ABS_MT_POSITION_X, 0);

		input_abs_set_fuzz(input_dev, ABS_MT_POSITION_Y, 0);

		input_abs_set_fuzz(input_dev, ABS_MT_PRESSURE, 0);

	}



	input_dev->name = devm_kasprintf(&client->dev, GFP_KERNEL,

					 "MELFAS MMS%d Touchscreen",

					 data->type);

	if (!input_dev->name)

		return -ENOMEM;



	input_dev->name = "MELFAS MMS114 Touchscreen";

	input_dev->id.bustype = BUS_I2C;

	input_dev->dev.parent = &client->dev;

	input_dev->open = mms114_input_open;
@@ -549,7 +597,13 @@ MODULE_DEVICE_TABLE(i2c, mms114_id); 


#ifdef CONFIG_OF

static const struct of_device_id mms114_dt_match[] = {

	{ .compatible = "melfas,mms114" },

	{

		.compatible = "melfas,mms114",

		.data = (void *)TYPE_MMS114,

	}, {

		.compatible = "melfas,mms152",

		.data = (void *)TYPE_MMS152,

	},

	{ }

};

MODULE_DEVICE_TABLE(of, mms114_dt_match);