Hi, Thanks for review! will send out V6 shortly On 28. 09. 20 23:16, Dmitry Torokhov wrote: > Hi Michael, > > On Mon, Sep 28, 2020 at 11:10:16AM +0200, michael.srba@xxxxxxxxx wrote: >> From: Michael Srba <Michael.Srba@xxxxxxxxx> >> >> Add support for the bt541 touchscreen IC from zinitix, loosely based on >> downstream driver. The driver currently supports multitouch (5 touch points). >> The bt541 seems to support touch keys, but the support was not added because >> that functionality is not being utilized by the touchscreen used for testing. >> Based on the similartities between downstream drivers, it seems likely that >> other similar touchscreen ICs can be supported with this driver in the future. >> >> Signed-off-by: Michael Srba <Michael.Srba@xxxxxxxxx> >> --- >> changes in v2: applied fixes per recommendation, added support for suspend/resume handling >> changes in v3: added support for working in different touch point report modes >> (modes 1 and 2 are now supported). mode 2 seems to work just fine >> on Samsung Galaxy A3 (2015), and also works on Samsung Galaxy S4 >> Mini Value Edition (where mode 1 doesn't seem to work because >> of different firmware version). It is expected that other fw >> versions, and models other than bt541, may have either mode broken >> (vendor doesn't use it -> they don't care) . >> changes in v4: - removed mode 1 for now to simplify the code and improve it's chances >> to get accepted. >> - added runtime pm to save power while not using the ts >> - refactored i2c helper functions >> - >> changes in v5: - send the actual intended V4 (sorry) >> >> bt541 is used in the Samsung Galaxy A3 (2015) that has recently gained >> mainline support [1]. >> >> The downstream driver this is loosely based on: >> https://github.com/msm8916-mainline/android_kernel_qcom_msm8916/tree/SM-A300FU/drivers/input/touchscreen/zinitix >> >> [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1329c1ab0730b521e6cd3051c56a2ff3d55f21e6 >> >> drivers/input/touchscreen/Kconfig | 12 + >> drivers/input/touchscreen/Makefile | 1 + >> drivers/input/touchscreen/zinitix.c | 589 ++++++++++++++++++++++++++++ >> 3 files changed, 602 insertions(+) >> create mode 100644 drivers/input/touchscreen/zinitix.c >> >> diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig >> index 35c867b2d9a7..f012fe746df0 100644 >> --- a/drivers/input/touchscreen/Kconfig >> +++ b/drivers/input/touchscreen/Kconfig >> @@ -1322,4 +1322,16 @@ config TOUCHSCREEN_IQS5XX >> To compile this driver as a module, choose M here: the >> module will be called iqs5xx. >> >> +config TOUCHSCREEN_ZINITIX >> + tristate "Zinitix touchscreen support" >> + depends on I2C >> + help >> + Say Y here if you have a touchscreen using Zinitix bt541, >> + or something similar enough. >> + >> + If unsure, say N. >> + >> + To compile this driver as a module, choose M here: the >> + module will be called zinitix. >> + >> endif >> diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile >> index 30d1e1b42492..6233541e9173 100644 >> --- a/drivers/input/touchscreen/Makefile >> +++ b/drivers/input/touchscreen/Makefile >> @@ -111,3 +111,4 @@ obj-$(CONFIG_TOUCHSCREEN_COLIBRI_VF50) += colibri-vf50-ts.o >> obj-$(CONFIG_TOUCHSCREEN_ROHM_BU21023) += rohm_bu21023.o >> obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW) += raspberrypi-ts.o >> obj-$(CONFIG_TOUCHSCREEN_IQS5XX) += iqs5xx.o >> +obj-$(CONFIG_TOUCHSCREEN_ZINITIX) += zinitix.o >> diff --git a/drivers/input/touchscreen/zinitix.c b/drivers/input/touchscreen/zinitix.c >> new file mode 100644 >> index 000000000000..650d7e8c4255 >> --- /dev/null >> +++ b/drivers/input/touchscreen/zinitix.c >> @@ -0,0 +1,589 @@ >> +// SPDX-License-Identifier: GPL-2.0-only >> + >> +#include <linux/kernel.h> >> +#include <linux/i2c.h> >> +#include <linux/input.h> >> +#include <linux/input/mt.h> >> +#include <linux/input/touchscreen.h> >> +#include <linux/module.h> >> +#include <linux/delay.h> >> +#include <linux/irq.h> >> +#include <linux/interrupt.h> >> +#include <linux/regulator/consumer.h> >> +#include <linux/slab.h> >> +#include <linux/of.h> >> +#include <asm/unaligned.h> > > What is using this? hmm, I don't think that header defines anything useful, not sure why it's included... will remove it > >> + >> +/* Register Map */ >> + >> +#define BT541_SWRESET_CMD 0x0000 >> +#define BT541_WAKEUP_CMD 0x0001 >> + >> +#define BT541_IDLE_CMD 0x0004 >> +#define BT541_SLEEP_CMD 0x0005 >> + >> +#define BT541_CLEAR_INT_STATUS_CMD 0x0003 >> +#define BT541_CALIBRATE_CMD 0x0006 >> +#define BT541_SAVE_STATUS_CMD 0x0007 >> +#define BT541_SAVE_CALIBRATION_CMD 0x0008 >> +#define BT541_RECALL_FACTORY_CMD 0x000f >> + >> +#define BT541_THRESHOLD 0x0020 >> + >> +#define BT541_LARGE_PALM_REJECT_AREA_TH 0x003F >> + >> +#define BT541_DEBUG_REG 0x0115 /* 0~7 */ >> + >> +#define BT541_TOUCH_MODE 0x0010 >> +#define BT541_CHIP_REVISION 0x0011 >> +#define BT541_FIRMWARE_VERSION 0x0012 >> + >> +#define ZINITIX_USB_DETECT 0x116 > > What does this do? a datasheet which would explain that is unfortunately not available afaict, but since it was part of downstream's register map I think it's useful to at least preserve that little bit of information > >> + >> +#define BT541_MINOR_FW_VERSION 0x0121 >> + >> +#define BT541_VENDOR_ID 0x001C >> +#define BT541_HW_ID 0x0014 >> + >> +#define BT541_DATA_VERSION_REG 0x0013 >> +#define BT541_SUPPORTED_FINGER_NUM 0x0015 >> +#define BT541_EEPROM_INFO 0x0018 >> +#define BT541_INITIAL_TOUCH_MODE 0x0019 >> + >> +#define BT541_TOTAL_NUMBER_OF_X 0x0060 >> +#define BT541_TOTAL_NUMBER_OF_Y 0x0061 >> + >> +#define BT541_DELAY_RAW_FOR_HOST 0x007f >> + >> +#define BT541_BUTTON_SUPPORTED_NUM 0x00B0 >> +#define BT541_BUTTON_SENSITIVITY 0x00B2 >> +#define BT541_DUMMY_BUTTON_SENSITIVITY 0X00C8 >> + >> +#define BT541_X_RESOLUTION 0x00C0 >> +#define BT541_Y_RESOLUTION 0x00C1 >> + >> +#define BT541_POINT_STATUS_REG 0x0080 >> +#define BT541_ICON_STATUS_REG 0x00AA >> + >> +#define BT541_POINT_COORD_REG (BT541_POINT_STATUS_REG + 2) >> + >> +#define BT541_AFE_FREQUENCY 0x0100 >> +#define BT541_DND_N_COUNT 0x0122 >> +#define BT541_DND_U_COUNT 0x0135 >> + >> +#define BT541_RAWDATA_REG 0x0200 >> + >> +#define BT541_EEPROM_INFO_REG 0x0018 >> + >> +#define BT541_INT_ENABLE_FLAG 0x00f0 >> +#define BT541_PERIODICAL_INTERRUPT_INTERVAL 0x00f1 >> + >> +#define BT541_BTN_WIDTH 0x016d >> + >> +#define BT541_CHECKSUM_RESULT 0x012c >> + >> +#define BT541_INIT_FLASH 0x01d0 >> +#define BT541_WRITE_FLASH 0x01d1 >> +#define BT541_READ_FLASH 0x01d2 >> + >> +#define ZINITIX_INTERNAL_FLAG_02 0x011e >> +#define ZINITIX_INTERNAL_FLAG_03 0x011f >> + >> +#define ZINITIX_I2C_CHECKSUM_WCNT 0x016a >> +#define ZINITIX_I2C_CHECKSUM_RESULT 0x016c >> + >> +/* Interrupt & status register flags */ >> + >> +#define BIT_PT_CNT_CHANGE BIT(0) >> +#define BIT_DOWN BIT(1) >> +#define BIT_MOVE BIT(2) >> +#define BIT_UP BIT(3) >> +#define BIT_PALM BIT(4) >> +#define BIT_PALM_REJECT BIT(5) >> +#define BIT_RESERVED_0 BIT(6) >> +#define BIT_RESERVED_1 BIT(7) >> +#define BIT_WEIGHT_CHANGE BIT(8) >> +#define BIT_PT_NO_CHANGE BIT(9) >> +#define BIT_REJECT BIT(10) >> +#define BIT_PT_EXIST BIT(11) >> +#define BIT_RESERVED_2 BIT(12) >> +#define BIT_ERROR BIT(13) >> +#define BIT_DEBUG BIT(14) >> +#define BIT_ICON_EVENT BIT(15) >> + >> +#define SUB_BIT_EXIST BIT(0) >> +#define SUB_BIT_DOWN BIT(1) >> +#define SUB_BIT_MOVE BIT(2) >> +#define SUB_BIT_UP BIT(3) >> +#define SUB_BIT_UPDATE BIT(4) >> +#define SUB_BIT_WAIT BIT(5) >> + >> +#define DEFAULT_TOUCH_POINT_MODE 2 >> +#define MAX_SUPPORTED_FINGER_NUM 5 >> + >> +#define CHIP_ON_DELAY 15 // ms >> +#define FIRMWARE_ON_DELAY 40 // ms >> + >> +struct point_coord { >> + __le16 x; >> + __le16 y; >> + u8 width; >> + u8 sub_status; >> + // currently unused, but needed as padding: >> + u8 minor_width; >> + u8 angle; >> +}; >> + >> +struct touch_event { >> + __le16 status; >> + u8 finger_cnt; >> + u8 time_stamp; >> + struct point_coord point_coord[MAX_SUPPORTED_FINGER_NUM]; >> +}; >> + >> +struct bt541_ts_data { >> + struct i2c_client *client; >> + struct input_dev *input_dev; >> + struct touchscreen_properties prop; >> + struct regulator_bulk_data supplies[2]; >> + u32 zinitix_mode; >> +}; >> + >> +static int zinitix_read_data(struct i2c_client *client, u16 reg, u8 *values, size_t length) >> +{ >> + int error; >> + __le16 reg_le = cpu_to_le16(reg); >> + >> + error = i2c_master_send(client, (u8 *)®_le, sizeof(reg_le)); >> + if (error < 0) >> + return error; >> + >> + error = i2c_master_recv(client, values, length); >> + if (error != length) >> + return error; > > Can this be a single i2c_transfer() with 2 messages? I tried that and it just silently failed, not sure if that's a possibility or if I did something wrong > >> + >> + return 0; >> +} >> + >> +static int zinitix_write_u16(struct i2c_client *client, u16 reg, u16 value) >> +{ >> + int error; >> + __le16 packet[2] = {cpu_to_le16(reg), cpu_to_le16(value)}; >> + >> + error = i2c_master_send(client, (u8 *)packet, sizeof(packet)); >> + if (error < 0) >> + return error; > > if (ret != sizeof(packet)) > return ret < 0 ? ret : -EIO; > will do >> + >> + return 0; >> +} >> + >> +static int zinitix_write_cmd(struct i2c_client *client, u16 reg) >> +{ >> + int error; >> + __le16 reg_le = cpu_to_le16(reg); >> + >> + error = i2c_master_send(client, (u8 *)®_le, sizeof(reg_le)); >> + if (error < 0) >> + return error; > > if (ret != sizeof(packet)) > return ret < 0 ? ret : -EIO; > ditto >> + >> + return 0; >> +} >> + >> +static bool zinitix_init_touch(struct bt541_ts_data *bt541) >> +{ >> + struct i2c_client *client = bt541->client; >> + int i; >> + int error; >> + >> + error = zinitix_write_cmd(client, BT541_SWRESET_CMD); >> + if (error) { >> + dev_err(&client->dev, "Failed to write reset command\n"); >> + return error; >> + } >> + >> + error = zinitix_write_u16(client, BT541_INT_ENABLE_FLAG, 0x0); >> + if (error) { >> + dev_err(&client->dev, "Failed to reset interrupt enable flag\n"); >> + return error; >> + } >> + >> + /* initialize */ >> + error = zinitix_write_u16(client, BT541_X_RESOLUTION, (u16)bt541->prop.max_x); >> + if (error) >> + return error; >> + >> + error = zinitix_write_u16(client, BT541_Y_RESOLUTION, (u16)bt541->prop.max_y); >> + if (error) >> + return error; >> + >> + error = zinitix_write_u16(client, BT541_SUPPORTED_FINGER_NUM, >> + (u16)MAX_SUPPORTED_FINGER_NUM); >> + if (error) >> + return error; >> + >> + error = zinitix_write_u16(client, BT541_INITIAL_TOUCH_MODE, bt541->zinitix_mode); >> + if (error) >> + return error; >> + >> + error = zinitix_write_u16(client, BT541_TOUCH_MODE, bt541->zinitix_mode); >> + if (error) >> + return error; >> + >> + error = zinitix_write_u16(client, BT541_INT_ENABLE_FLAG, >> + BIT_PT_CNT_CHANGE | BIT_DOWN | BIT_MOVE | BIT_UP); >> + if (error) >> + return error; >> + >> + /* clear queue */ >> + for (i = 0; i < 10; i++) { >> + zinitix_write_cmd(client, BT541_CLEAR_INT_STATUS_CMD); >> + udelay(10); >> + } >> + >> + return 0; >> +} >> + >> +static int zinitix_init_regulators(struct bt541_ts_data *bt541) >> +{ >> + struct i2c_client *client = bt541->client; >> + int error; >> + >> + bt541->supplies[0].supply = "vdd"; >> + bt541->supplies[1].supply = "vddo"; >> + error = devm_regulator_bulk_get(&client->dev, ARRAY_SIZE(bt541->supplies), >> + bt541->supplies); >> + if (error < 0) { >> + dev_err(&client->dev, "Failed to get regulators: %d\n", error); >> + return error; >> + } >> + >> + return 0; >> +} >> + >> +static int zinitix_send_power_on_sequence(struct bt541_ts_data *bt541) >> +{ >> + int error; >> + struct i2c_client *client = bt541->client; >> + >> + error = zinitix_write_u16(client, 0xc000, 0x0001); >> + if (error) { >> + dev_err(&client->dev, "Failed to send power sequence(vendor cmd enable)\n"); >> + return error; >> + } >> + udelay(10); >> + >> + error = zinitix_write_cmd(client, 0xc004); >> + if (error) { >> + dev_err(&client->dev, "Failed to send power sequence(intn clear)\n"); >> + return error; >> + } >> + udelay(10); >> + >> + error = zinitix_write_u16(client, 0xc002, 0x0001); >> + if (error) { >> + dev_err(&client->dev, "Failed to send power sequence(nvm init)\n"); >> + return error; >> + } >> + mdelay(2); >> + >> + error = zinitix_write_u16(client, 0xc001, 0x0001); >> + if (error) { >> + dev_err(&client->dev, "Failed to send power sequence(program start)\n"); >> + return error; >> + } >> + msleep(FIRMWARE_ON_DELAY); >> + >> + return 0; >> +} >> + >> +static irqreturn_t zinitix_ts_irq_handler(int irq, void *bt541_handler) >> +{ >> + struct bt541_ts_data *bt541 = (struct bt541_ts_data *)bt541_handler; >> + struct i2c_client *client = bt541->client; >> + struct input_dev *input_dev = bt541->input_dev; >> + int i; >> + int error; >> + struct touch_event touch_event; >> + >> + mutex_lock(&input_dev->mutex); >> + if (!input_dev->users) { >> + mutex_unlock(&input_dev->mutex); >> + return IRQ_HANDLED; >> + } >> + mutex_unlock(&input_dev->mutex); > > This is not needed as you use disable_irq_sync() in close(), so when > it returns interrupt will be done processing. > will remove it >> + >> + memset(&touch_event, 0, sizeof(struct touch_event)); >> + >> + error = zinitix_read_data(bt541->client, BT541_POINT_STATUS_REG, >> + (u8 *)&touch_event, sizeof(struct touch_event)); >> + if (error) { >> + dev_err(&client->dev, "Failed to read in touchpoint struct\n"); > > goto out; > can do >> + >> + zinitix_write_cmd(bt541->client, BT541_CLEAR_INT_STATUS_CMD); >> + return IRQ_HANDLED; >> + } >> + >> + for (i = 0; i < MAX_SUPPORTED_FINGER_NUM; i++) { >> + if (!(touch_event.point_coord[i].sub_status & SUB_BIT_EXIST)) >> + continue; >> + >> + input_mt_slot(bt541->input_dev, i); >> + input_mt_report_slot_state(bt541->input_dev, MT_TOOL_FINGER, true); >> + touchscreen_report_pos(bt541->input_dev, &bt541->prop, >> + le16_to_cpu(touch_event.point_coord[i].x), >> + le16_to_cpu(touch_event.point_coord[i].y), true); >> + input_report_abs(bt541->input_dev, ABS_MT_TOUCH_MAJOR, >> + touch_event.point_coord[i].width); >> + } >> + >> + input_mt_sync_frame(bt541->input_dev); >> + input_sync(bt541->input_dev); >> + > > out: > ditto >> + zinitix_write_cmd(bt541->client, BT541_CLEAR_INT_STATUS_CMD); >> + >> + return IRQ_HANDLED; >> +} >> + >> +static int zinitix_start(struct bt541_ts_data *bt541) >> +{ >> + int error; >> + >> + error = regulator_bulk_enable(ARRAY_SIZE(bt541->supplies), bt541->supplies); >> + if (error < 0) { >> + dev_err(&bt541->client->dev, "Failed to enable regulators: %d\n", error); >> + return error; >> + } >> + >> + msleep(CHIP_ON_DELAY); >> + >> + error = zinitix_send_power_on_sequence(bt541); >> + if (error) { >> + dev_err(&bt541->client->dev, "Error while sending power-on sequence: %d\n", error); >> + return error; >> + } >> + >> + error = zinitix_init_touch(bt541); >> + if (error) { >> + dev_err(&bt541->client->dev, "Error while configuring touch IC\n"); >> + return error; >> + } >> + >> + enable_irq(bt541->client->irq); >> + >> + return 0; >> +} >> + >> +static int zinitix_stop(struct bt541_ts_data *bt541) >> +{ >> + int error; >> + >> + disable_irq(bt541->client->irq); >> + >> + error = regulator_bulk_disable(ARRAY_SIZE(bt541->supplies), bt541->supplies); >> + if (error) { >> + dev_err(&bt541->client->dev, "Failed to disable regulators: %d\n", error); >> + return error; >> + } >> + >> + return 0; >> +} >> + >> +static void zinitix_graceful_shutdown(void *arg) >> +{ >> + struct bt541_ts_data *bt541 = arg; >> + >> + zinitix_stop(bt541); >> +} >> + >> +static int zinitix_input_open(struct input_dev *dev) >> +{ >> + struct bt541_ts_data *bt541 = input_get_drvdata(dev); >> + >> + return zinitix_start(bt541); >> +} >> + >> +static void zinitix_input_close(struct input_dev *dev) >> +{ >> + struct bt541_ts_data *bt541 = input_get_drvdata(dev); >> + >> + zinitix_stop(bt541); >> +} >> + >> +static int zinitix_init_input_dev(struct bt541_ts_data *bt541) >> +{ >> + int error; >> + >> + bt541->input_dev = devm_input_allocate_device(&bt541->client->dev); >> + if (!bt541->input_dev) { >> + dev_err(&bt541->client->dev, "Failed to allocate input device."); >> + return -ENOMEM; >> + } >> + >> + bt541->input_dev->name = "Zinitix Capacitive TouchScreen"; >> + bt541->input_dev->phys = "input/ts"; >> + bt541->input_dev->id.bustype = BUS_I2C; >> + bt541->input_dev->open = zinitix_input_open; >> + bt541->input_dev->close = zinitix_input_close; >> + >> + input_set_capability(bt541->input_dev, EV_ABS, ABS_MT_POSITION_X); >> + input_set_capability(bt541->input_dev, EV_ABS, ABS_MT_POSITION_Y); >> + input_set_abs_params(bt541->input_dev, ABS_MT_WIDTH_MAJOR, 0, 255, 0, 0); >> + input_set_abs_params(bt541->input_dev, ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0); >> + >> + touchscreen_parse_properties(bt541->input_dev, true, &bt541->prop); >> + >> + if (!bt541->prop.max_x || !bt541->prop.max_y) { >> + dev_err(&bt541->client->dev, >> + "Touchscreen-size-x and/or touchscreen-size-y not set in dts\n"); >> + return -EINVAL; >> + } >> + >> + error = input_mt_init_slots(bt541->input_dev, MAX_SUPPORTED_FINGER_NUM, >> + INPUT_MT_DIRECT | INPUT_MT_DROP_UNUSED); >> + if (error) { >> + dev_err(&bt541->client->dev, >> + "Failed to initialize MT slots: %d", error); >> + return error; >> + } >> + >> + error = input_register_device(bt541->input_dev); >> + if (error) { >> + dev_err(&bt541->client->dev, >> + "Failed to register input device: %d", error); >> + return error; >> + } >> + >> + input_set_drvdata(bt541->input_dev, bt541); >> + >> + return 0; >> +} >> + >> +static int zinitix_ts_probe(struct i2c_client *client, const struct i2c_device_id *id) >> +{ >> + struct bt541_ts_data *bt541; >> + int error; >> + >> + if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { >> + dev_err(&client->dev, "Failed to assert adapter's support for plain I2C.\n"); >> + return -ENXIO; >> + } >> + >> + bt541 = devm_kzalloc(&client->dev, sizeof(*bt541), GFP_KERNEL); >> + if (!bt541) >> + return -ENOMEM; >> + >> + bt541->client = client; >> + i2c_set_clientdata(client, bt541); >> + >> + error = zinitix_init_regulators(bt541); >> + if (error) { >> + dev_err(&client->dev, "Failed to initialize regulators: %d\n", error); >> + return error; >> + } >> + >> + error = zinitix_init_input_dev(bt541); >> + if (error) { >> + dev_err(&client->dev, "Failed to initialize input device: %d\n", error); >> + return error; >> + } >> + >> + error = device_property_read_u32(&client->dev, "zinitix,mode", &bt541->zinitix_mode); >> + if (error < 0) { >> + // fall back to mode 2 >> + bt541->zinitix_mode = DEFAULT_TOUCH_POINT_MODE; >> + } >> + >> + if (bt541->zinitix_mode != 2) { >> + // if devices are found which don't support mode 2, support for other modes (0, 1) >> + // may be needed. >> + dev_err(&client->dev, "Malformed zinitix,mode property, must be 2 (supplied: %d)\n", >> + bt541->zinitix_mode); >> + return -EINVAL; >> + } >> + >> + error = devm_add_action_or_reset(&client->dev, >> + zinitix_graceful_shutdown, bt541); >> + if (error) { >> + dev_err(&client->dev, "Failed to install poweroff handler: %d\n", error); >> + return error; >> + } > > I do not think you need this. You will gracefully shut down the > controller in close(), which is only called if open) was called earlier. > Otherwise the regulators are disabled anyways. > > makes sense, will remove >> + >> + error = devm_request_threaded_irq(&bt541->client->dev, bt541->client->irq, >> + NULL, zinitix_ts_irq_handler, >> + IRQF_TRIGGER_FALLING | IRQF_ONESHOT, > > Let's rely on DTS to configure trigger properly. my bad, will fix > Also instead of disable_irq() below maybe use > > irq_set_status_flags(client->irq, IRQ_NOAUTOEN); > > before calling into devm_request_threaded_irq()? > seems cleaner, thanks >> + bt541->client->name, bt541); >> + if (error) { >> + dev_err(&client->dev, "Failed to request IRQ: %d\n", error); >> + return error; >> + } >> + >> + disable_irq(client->irq); // disable the irq until userspace actually tries to use the TS >> + >> + dev_info(&client->dev, "Initialized a zinitix touchscreen\n"); > > Please drop. > my bad, will do >> + >> + return 0; >> +} >> + >> +static int __maybe_unused zinitix_suspend(struct device *dev) >> +{ >> + struct i2c_client *client = to_i2c_client(dev); >> + struct bt541_ts_data *bt541 = i2c_get_clientdata(client); >> + >> + /* Release all fingers */ >> + input_mt_sync_frame(bt541->input_dev); >> + input_sync(bt541->input_dev); > > Is this really needed? if we need to drop contacts, then it should be > done in input core, but userspace should be already frozen at this > point, so release events will reach userspace only after resume and I > think userspace knows how to discard events older than X anyways. > in my testing (phosh on postmarketOS), it is indeed needed, otherwise userspace thinks there are still fingers touching the screen after resume from suspend (this is possibly not very likely to cause issues under normal circumstances, but it seems worth fixing) >> + >> + mutex_lock(&bt541->input_dev->mutex); >> + >> + if (bt541->input_dev->users) >> + zinitix_stop(bt541); >> + >> + mutex_unlock(&bt541->input_dev->mutex); >> + >> + return 0; >> +} >> + >> +static int __maybe_unused zinitix_resume(struct device *dev) >> +{ >> + struct i2c_client *client = to_i2c_client(dev); >> + struct bt541_ts_data *bt541 = i2c_get_clientdata(client); >> + int error; >> + >> + mutex_lock(&bt541->input_dev->mutex); >> + >> + if (bt541->input_dev->users) { >> + error = zinitix_start(bt541); >> + if (error) { >> + mutex_unlock(&bt541->input_dev->mutex); >> + return error; > > Use single mutex_unlock() please. so: > > int retval = 0; > > mutex_lock(...); > > if (bt541->input_dev->users) > retval = zinitix_start(bt541); > > mutex_unlock(...); > return retval; > > that is definitely much cleaner, thanks >> + } >> + } >> + >> + mutex_unlock(&bt541->input_dev->mutex); >> + >> + return 0; >> +} >> + >> +static SIMPLE_DEV_PM_OPS(zinitix_pm_ops, zinitix_suspend, zinitix_resume); >> + >> +#ifdef CONFIG_OF >> +static const struct of_device_id zinitix_of_match[] = { >> + { .compatible = "zinitix,bt541" }, >> + { } >> +}; >> +MODULE_DEVICE_TABLE(of, zinitix_of_match); >> +#endif >> + >> +static struct i2c_driver zinitix_ts_driver = { >> + .probe = zinitix_ts_probe, >> + .driver = { >> + .name = "Zinitix-TS", >> + .pm = &zinitix_pm_ops, >> + .of_match_table = of_match_ptr(zinitix_of_match), >> + }, >> +}; >> +module_i2c_driver(zinitix_ts_driver); >> + >> +MODULE_AUTHOR("Michael Srba <Michael.Srba@xxxxxxxxx>"); >> +MODULE_DESCRIPTION("Zinitix touchscreen driver"); >> +MODULE_LICENSE("GPL v2"); >> -- >> 2.28.0 >> > > Thanks. >
