| Message ID | 20230303222113.285546-3-hdegoede@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/2] Input: hideep - Silence error in SW_RESET() | expand |
On 03/03/2023 23:21, Hans de Goede wrote: > The HiDeep IST940E touchscreen controller used on the Lenovo Yoga Book X90F > convertible comes up in HID mode by default. > > This works well on the X91F Windows model where the touchscreen is > correctly described in ACPI and ACPI takes care of controlling > the reset GPIO and regulators. > > But the X90F ships with Android and the ACPI tables on this model don't > describe the touchscreen. Instead this is hardcoded in the vendor kernel. > > The vendor kernel uses the touchscreen in native HiDeep 20 (2.0?) protocol > mode and switches the controller to this mode by writing 0 to reg 0x081e. > > Adjusting the i2c-hid code to deal with the reset-gpio and regulators on > this non devicetree (but rather broken ACPI) convertible is somewhat tricky > and the native protocol reports ABS_MT_PRESSURE and ABS_MT_TOUCH_MAJOR > which are not reported in HID mode, so it is preferable to use the native > mode. > > Add support to the hideep driver to reset the work-mode to the native > HiDeep protocol to allow using it on the Lenovo Yoga Book X90F. > This is guarded behind a new "hideep,reset-work-mode" boolean property, > to avoid changing behavior on other devices. > > For the record: I did test using the i2c-hid driver with some quick hacks > and it does work. The I2C-HID descriptor is available from address 0x0020, > just like on the X91F Windows model. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Please use scripts/get_maintainers.pl to get a list of necessary people and lists to CC. It might happen, that command when run on an older kernel, gives you outdated entries. Therefore please be sure you base your patches on recent Linux kernel. > --- > .../bindings/input/touchscreen/hideep.txt | 1 + > drivers/input/touchscreen/hideep.c | 16 ++++++++++++++++ > 2 files changed, 17 insertions(+) > > diff --git a/Documentation/devicetree/bindings/input/touchscreen/hideep.txt b/Documentation/devicetree/bindings/input/touchscreen/hideep.txt > index a47c36190b01..68bb9f8dcc30 100644 > --- a/Documentation/devicetree/bindings/input/touchscreen/hideep.txt > +++ b/Documentation/devicetree/bindings/input/touchscreen/hideep.txt > @@ -17,6 +17,7 @@ Optional properties: > - linux,keycodes : Specifies an array of numeric keycode values to > be used for reporting button presses. The array can > contain up to 3 entries. > +- hideep,reset-work-mode: bool, reset touch report format to the native HiDeep protocol Bindings must be a separate patch. Also, would be nice to convert first the TXT to DT schema (YAML). "-mode" suggests it's some enum, not bool. Otherwise what exactly it is choosing (which mode)? Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/input/touchscreen/hideep.txt b/Documentation/devicetree/bindings/input/touchscreen/hideep.txt index a47c36190b01..68bb9f8dcc30 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/hideep.txt +++ b/Documentation/devicetree/bindings/input/touchscreen/hideep.txt @@ -17,6 +17,7 @@ Optional properties: - linux,keycodes : Specifies an array of numeric keycode values to be used for reporting button presses. The array can contain up to 3 entries. +- hideep,reset-work-mode: bool, reset touch report format to the native HiDeep protocol Example: diff --git a/drivers/input/touchscreen/hideep.c b/drivers/input/touchscreen/hideep.c index 373c1269485f..452914b78bf9 100644 --- a/drivers/input/touchscreen/hideep.c +++ b/drivers/input/touchscreen/hideep.c @@ -35,6 +35,7 @@ #define HIDEEP_EVENT_ADDR 0x240 /* command list */ +#define HIDEEP_WORK_MODE 0x081e #define HIDEEP_RESET_CMD 0x9800 /* event bit */ @@ -964,6 +965,17 @@ static const struct attribute_group hideep_ts_attr_group = { .attrs = hideep_ts_sysfs_entries, }; +static void hideep_set_work_mode(struct hideep_ts *ts) +{ + /* + * Reset touch report format to the native HiDeep 20 protocol if requested. + * This is necessary to make touchscreens which come up in I2C-HID mode + * work with this driver. + */ + if (device_property_read_bool(&ts->client->dev, "hideep,reset-work-mode")) + regmap_write(ts->reg, HIDEEP_WORK_MODE, 0x00); +} + static int __maybe_unused hideep_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); @@ -987,6 +999,8 @@ static int __maybe_unused hideep_resume(struct device *dev) return error; } + hideep_set_work_mode(ts); + enable_irq(client->irq); return 0; @@ -1063,6 +1077,8 @@ static int hideep_probe(struct i2c_client *client) return error; } + hideep_set_work_mode(ts); + error = hideep_init_input(ts); if (error) return error;
The HiDeep IST940E touchscreen controller used on the Lenovo Yoga Book X90F convertible comes up in HID mode by default. This works well on the X91F Windows model where the touchscreen is correctly described in ACPI and ACPI takes care of controlling the reset GPIO and regulators. But the X90F ships with Android and the ACPI tables on this model don't describe the touchscreen. Instead this is hardcoded in the vendor kernel. The vendor kernel uses the touchscreen in native HiDeep 20 (2.0?) protocol mode and switches the controller to this mode by writing 0 to reg 0x081e. Adjusting the i2c-hid code to deal with the reset-gpio and regulators on this non devicetree (but rather broken ACPI) convertible is somewhat tricky and the native protocol reports ABS_MT_PRESSURE and ABS_MT_TOUCH_MAJOR which are not reported in HID mode, so it is preferable to use the native mode. Add support to the hideep driver to reset the work-mode to the native HiDeep protocol to allow using it on the Lenovo Yoga Book X90F. This is guarded behind a new "hideep,reset-work-mode" boolean property, to avoid changing behavior on other devices. For the record: I did test using the i2c-hid driver with some quick hacks and it does work. The I2C-HID descriptor is available from address 0x0020, just like on the X91F Windows model. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- .../bindings/input/touchscreen/hideep.txt | 1 + drivers/input/touchscreen/hideep.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+)