The Elan eKTH5015M touch controller on the X13s requires a 300 ms delay
before sending commands after having deasserted reset during power on.
This series switches the X13s devicetree to use the Elan specific
binding so that the OS can determine the required power-on sequence and
make sure that the controller is always detected during boot. [1]
The Elan hid-i2c driver currently asserts reset unconditionally during
suspend, which does not work on the X13s where the touch controller
supply is shared with other peripherals that may remain powered. Holding
the controller in reset can increase power consumption and also leaks
current through the reset circuitry pull ups.
Note that the latter also affects X13s variants where the touchscreen is
not populated as the driver also exits probe() with reset asserted.
Fix this by adding a new 'no-reset-on-power-off' devicetree property
which can be used by the OS to determine when reset needs to be asserted
on power down and when it safe and desirable to leave it deasserted.
I tried to look for drivers that had already addressed this but it was
only after I finished implementing this that I noticed Doug's reference
to commit 18eeef46d359 ("HID: i2c-hid: goodix: Tie the reset line to
true state of the regulator"), which tried to solve a related problem.
That commit has since been reverted but ultimately resulted in commit
7607f12ba735 ("HID: i2c-hid: goodix: Add support for
"goodix,no-reset-during-suspend" property") being merged to handle the
related case where the touch controller supply is always on.
The implementation is very similar, but I decided to use the slightly
more generic 'no-reset-on-power-off' property name after considering a
number of alternatives (including trying to describe the hardware
configuration in the name). (And as this is not vendor specific, I left
out the prefix.)
Note that my X13s does not have a touchscreen, but I have done partial
verification of the implementation using that machine and the sc8280xp
CRD reference design. Bjorn has promised to help out with final
verification on an X13s with a touchscreen.
The devicetree changes are expected to go in through the Qualcomm tree
once the binding and driver updates have been merged.
Johan
[1] The reset signal is currently deasserted using the pin configuration
and the controller would be detected if probe is deferred or if user
space triggers a reprobe through sysfs.
Changes in v2
- drop redundant 'items' from binding
- include a "should" in description of 'no-reset-on-power-off' property
- always assert reset on probe
- enable elan i2c-hid driver in arm64 defconfig
Johan Hovold (7):
dt-bindings: HID: i2c-hid: add dedicated Ilitek ILI2901 schema
dt-bindings: HID: i2c-hid: elan: add Elan eKTH5015M
dt-bindings: HID: i2c-hid: elan: add 'no-reset-on-power-off' property
HID: i2c-hid: elan: fix reset suspend current leakage
arm64: dts: qcom: sc8280xp-x13s: fix touchscreen power on
arm64: dts: qcom: sc8280xp-crd: use external pull up for touch reset
arm64: defconfig: enable Elan i2c-hid driver
.../bindings/input/elan,ekth6915.yaml | 19 ++++--
.../bindings/input/ilitek,ili2901.yaml | 66 +++++++++++++++++++
arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 3 +-
.../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 15 +++--
arch/arm64/configs/defconfig | 1 +
drivers/hid/i2c-hid/i2c-hid-of-elan.c | 59 +++++++++++++----
6 files changed, 137 insertions(+), 26 deletions(-)
create mode 100644 Documentation/devicetree/bindings/input/ilitek,ili2901.yaml
--
2.43.2
The Elan eKTH5015M touch controller found on the Lenovo ThinkPad X13s
shares the VCC33 supply with other peripherals that may remain powered
during suspend (e.g. when enabled as wakeup sources).
The reset line is also wired so that it can be left deasserted when the
supply is off.
This is important as it avoids holding the controller in reset for
extended periods of time when it remains powered, which can lead to
increased power consumption, and also avoids leaking current through the
X13s reset circuitry during suspend (and after driver unbind).
Use the new 'no-reset-on-power-off' devicetree property to determine
when reset needs to be asserted on power down.
Notably this also avoids wasting power on machine variants without a
touchscreen for which the driver would otherwise exit probe with reset
asserted.
Fixes: bd3cba00dcc6 ("HID: i2c-hid: elan: Add support for Elan eKTH6915 i2c-hid touchscreens")
Cc: [email protected] # 6.0
Cc: Douglas Anderson <[email protected]>
Tested-by: Steev Klimaszewski <[email protected]>
Signed-off-by: Johan Hovold <[email protected]>
---
drivers/hid/i2c-hid/i2c-hid-of-elan.c | 59 +++++++++++++++++++++------
1 file changed, 47 insertions(+), 12 deletions(-)
diff --git a/drivers/hid/i2c-hid/i2c-hid-of-elan.c b/drivers/hid/i2c-hid/i2c-hid-of-elan.c
index 5b91fb106cfc..091e37933225 100644
--- a/drivers/hid/i2c-hid/i2c-hid-of-elan.c
+++ b/drivers/hid/i2c-hid/i2c-hid-of-elan.c
@@ -31,6 +31,7 @@ struct i2c_hid_of_elan {
struct regulator *vcc33;
struct regulator *vccio;
struct gpio_desc *reset_gpio;
+ bool no_reset_on_power_off;
const struct elan_i2c_hid_chip_data *chip_data;
};
@@ -40,17 +41,17 @@ static int elan_i2c_hid_power_up(struct i2chid_ops *ops)
container_of(ops, struct i2c_hid_of_elan, ops);
int ret;
+ gpiod_set_value_cansleep(ihid_elan->reset_gpio, 1);
+
if (ihid_elan->vcc33) {
ret = regulator_enable(ihid_elan->vcc33);
if (ret)
- return ret;
+ goto err_deassert_reset;
}
ret = regulator_enable(ihid_elan->vccio);
- if (ret) {
- regulator_disable(ihid_elan->vcc33);
- return ret;
- }
+ if (ret)
+ goto err_disable_vcc33;
if (ihid_elan->chip_data->post_power_delay_ms)
msleep(ihid_elan->chip_data->post_power_delay_ms);
@@ -60,6 +61,15 @@ static int elan_i2c_hid_power_up(struct i2chid_ops *ops)
msleep(ihid_elan->chip_data->post_gpio_reset_on_delay_ms);
return 0;
+
+err_disable_vcc33:
+ if (ihid_elan->vcc33)
+ regulator_disable(ihid_elan->vcc33);
+err_deassert_reset:
+ if (ihid_elan->no_reset_on_power_off)
+ gpiod_set_value_cansleep(ihid_elan->reset_gpio, 0);
+
+ return ret;
}
static void elan_i2c_hid_power_down(struct i2chid_ops *ops)
@@ -67,7 +77,14 @@ static void elan_i2c_hid_power_down(struct i2chid_ops *ops)
struct i2c_hid_of_elan *ihid_elan =
container_of(ops, struct i2c_hid_of_elan, ops);
- gpiod_set_value_cansleep(ihid_elan->reset_gpio, 1);
+ /*
+ * Do not assert reset when the hardware allows for it to remain
+ * deasserted regardless of the state of the (shared) power supply to
+ * avoid wasting power when the supply is left on.
+ */
+ if (!ihid_elan->no_reset_on_power_off)
+ gpiod_set_value_cansleep(ihid_elan->reset_gpio, 1);
+
if (ihid_elan->chip_data->post_gpio_reset_off_delay_ms)
msleep(ihid_elan->chip_data->post_gpio_reset_off_delay_ms);
@@ -79,6 +96,7 @@ static void elan_i2c_hid_power_down(struct i2chid_ops *ops)
static int i2c_hid_of_elan_probe(struct i2c_client *client)
{
struct i2c_hid_of_elan *ihid_elan;
+ int ret;
ihid_elan = devm_kzalloc(&client->dev, sizeof(*ihid_elan), GFP_KERNEL);
if (!ihid_elan)
@@ -93,21 +111,38 @@ static int i2c_hid_of_elan_probe(struct i2c_client *client)
if (IS_ERR(ihid_elan->reset_gpio))
return PTR_ERR(ihid_elan->reset_gpio);
+ ihid_elan->no_reset_on_power_off = of_property_read_bool(client->dev.of_node,
+ "no-reset-on-power-off");
+
ihid_elan->vccio = devm_regulator_get(&client->dev, "vccio");
- if (IS_ERR(ihid_elan->vccio))
- return PTR_ERR(ihid_elan->vccio);
+ if (IS_ERR(ihid_elan->vccio)) {
+ ret = PTR_ERR(ihid_elan->vccio);
+ goto err_deassert_reset;
+ }
ihid_elan->chip_data = device_get_match_data(&client->dev);
if (ihid_elan->chip_data->main_supply_name) {
ihid_elan->vcc33 = devm_regulator_get(&client->dev,
ihid_elan->chip_data->main_supply_name);
- if (IS_ERR(ihid_elan->vcc33))
- return PTR_ERR(ihid_elan->vcc33);
+ if (IS_ERR(ihid_elan->vcc33)) {
+ ret = PTR_ERR(ihid_elan->vcc33);
+ goto err_deassert_reset;
+ }
}
- return i2c_hid_core_probe(client, &ihid_elan->ops,
- ihid_elan->chip_data->hid_descriptor_address, 0);
+ ret = i2c_hid_core_probe(client, &ihid_elan->ops,
+ ihid_elan->chip_data->hid_descriptor_address, 0);
+ if (ret)
+ goto err_deassert_reset;
+
+ return 0;
+
+err_deassert_reset:
+ if (ihid_elan->no_reset_on_power_off)
+ gpiod_set_value_cansleep(ihid_elan->reset_gpio, 0);
+
+ return ret;
}
static const struct elan_i2c_hid_chip_data elan_ekth6915_chip_data = {
--
2.43.2
The touch controller reset line is currently not described by the
devicetree except in the pin configuration which is used to deassert
reset.
As the reset line has an external pull up to an always-on rail there is
no need to drive the pin high so just leave it configured as an input
and disable the internal pull down.
Signed-off-by: Johan Hovold <[email protected]>
---
arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
index 41215567b3ae..372b35fb844f 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
@@ -977,8 +977,7 @@ int-n-pins {
reset-n-pins {
pins = "gpio99";
function = "gpio";
- output-high;
- drive-strength = <16>;
+ bias-disable;
};
};
--
2.43.2
Hi,
On Tue, May 7, 2024 at 7:48 AM Johan Hovold <[email protected]> wrote:
>
> @@ -40,17 +41,17 @@ static int elan_i2c_hid_power_up(struct i2chid_ops *ops)
> container_of(ops, struct i2c_hid_of_elan, ops);
> int ret;
>
> + gpiod_set_value_cansleep(ihid_elan->reset_gpio, 1);
Could probably use a comment above it saying that this is important
when we have "no_reset_on_power_off" and doesn't do anything bad when
we don't so we can just do it unconditionally.
> +
> if (ihid_elan->vcc33) {
> ret = regulator_enable(ihid_elan->vcc33);
> if (ret)
> - return ret;
> + goto err_deassert_reset;
> }
>
> ret = regulator_enable(ihid_elan->vccio);
> - if (ret) {
> - regulator_disable(ihid_elan->vcc33);
> - return ret;
> - }
> + if (ret)
> + goto err_disable_vcc33;
>
> if (ihid_elan->chip_data->post_power_delay_ms)
> msleep(ihid_elan->chip_data->post_power_delay_ms);
> @@ -60,6 +61,15 @@ static int elan_i2c_hid_power_up(struct i2chid_ops *ops)
> msleep(ihid_elan->chip_data->post_gpio_reset_on_delay_ms);
>
> return 0;
> +
> +err_disable_vcc33:
> + if (ihid_elan->vcc33)
> + regulator_disable(ihid_elan->vcc33);
> +err_deassert_reset:
> + if (ihid_elan->no_reset_on_power_off)
> + gpiod_set_value_cansleep(ihid_elan->reset_gpio, 0);
Small nit about the error label: it sounds as if when you go here you
_will_ deassert reset when in actuality you might or might not
(depending on no_reset_on_power_off). Personally I prefer to label
error jumps based on things I've done instead of things that the error
jump needs to do, so you could call them "err_enabled_vcc33" and
"err_asserted_reset"...
I don't feel that strongly about it, though, so if you love the label
you have then no need to change it.
> @@ -67,7 +77,14 @@ static void elan_i2c_hid_power_down(struct i2chid_ops *ops)
> struct i2c_hid_of_elan *ihid_elan =
> container_of(ops, struct i2c_hid_of_elan, ops);
>
> - gpiod_set_value_cansleep(ihid_elan->reset_gpio, 1);
> + /*
> + * Do not assert reset when the hardware allows for it to remain
> + * deasserted regardless of the state of the (shared) power supply to
> + * avoid wasting power when the supply is left on.
> + */
> + if (!ihid_elan->no_reset_on_power_off)
> + gpiod_set_value_cansleep(ihid_elan->reset_gpio, 1);
> +
> if (ihid_elan->chip_data->post_gpio_reset_off_delay_ms)
> msleep(ihid_elan->chip_data->post_gpio_reset_off_delay_ms);
Shouldn't the above two lines be inside the "if
(!ihid_elan->no_reset_on_power_off)" test? If you're not setting the
reset GPIO then you don't need to do the delay, right?
> @@ -79,6 +96,7 @@ static void elan_i2c_hid_power_down(struct i2chid_ops *ops)
> static int i2c_hid_of_elan_probe(struct i2c_client *client)
> {
> struct i2c_hid_of_elan *ihid_elan;
> + int ret;
>
> ihid_elan = devm_kzalloc(&client->dev, sizeof(*ihid_elan), GFP_KERNEL);
> if (!ihid_elan)
> @@ -93,21 +111,38 @@ static int i2c_hid_of_elan_probe(struct i2c_client *client)
> if (IS_ERR(ihid_elan->reset_gpio))
> return PTR_ERR(ihid_elan->reset_gpio);
>
> + ihid_elan->no_reset_on_power_off = of_property_read_bool(client->dev.of_node,
> + "no-reset-on-power-off");
Personally, I'd rather you query for the property before you request
the GPIO and then request the GPIO in the "powered off" state just to
keep everything in the most consistent state possible.
-Doug
Hi Doug,
and sorry about the late reply. Was travelling last week.
On Fri, May 10, 2024 at 04:36:08PM -0700, Doug Anderson wrote:
> On Tue, May 7, 2024 at 7:48 AM Johan Hovold <[email protected]> wrote:
> >
> > @@ -40,17 +41,17 @@ static int elan_i2c_hid_power_up(struct i2chid_ops *ops)
> > container_of(ops, struct i2c_hid_of_elan, ops);
> > int ret;
> >
> > + gpiod_set_value_cansleep(ihid_elan->reset_gpio, 1);
>
> Could probably use a comment above it saying that this is important
> when we have "no_reset_on_power_off" and doesn't do anything bad when
> we don't so we can just do it unconditionally.
Possibly, but I'd prefer not to add comments for things like this, which
should be apparent from just looking at the code. And explicitly
asserting reset before deasserting it is not unusual in any way.
> > +
> > if (ihid_elan->vcc33) {
> > ret = regulator_enable(ihid_elan->vcc33);
> > if (ret)
> > - return ret;
> > + goto err_deassert_reset;
> > }
> >
> > ret = regulator_enable(ihid_elan->vccio);
> > - if (ret) {
> > - regulator_disable(ihid_elan->vcc33);
> > - return ret;
> > - }
> > + if (ret)
> > + goto err_disable_vcc33;
> >
> > if (ihid_elan->chip_data->post_power_delay_ms)
> > msleep(ihid_elan->chip_data->post_power_delay_ms);
> > @@ -60,6 +61,15 @@ static int elan_i2c_hid_power_up(struct i2chid_ops *ops)
> > msleep(ihid_elan->chip_data->post_gpio_reset_on_delay_ms);
> >
> > return 0;
> > +
> > +err_disable_vcc33:
> > + if (ihid_elan->vcc33)
> > + regulator_disable(ihid_elan->vcc33);
> > +err_deassert_reset:
> > + if (ihid_elan->no_reset_on_power_off)
> > + gpiod_set_value_cansleep(ihid_elan->reset_gpio, 0);
>
> Small nit about the error label: it sounds as if when you go here you
> _will_ deassert reset when in actuality you might or might not
> (depending on no_reset_on_power_off).
Yes, this is similar to how err_disable_vcc33 may or may not disable the
optional regulator.
> Personally I prefer to label
> error jumps based on things I've done instead of things that the error
> jump needs to do, so you could call them "err_enabled_vcc33" and
> "err_asserted_reset"...
Naming labels after what they do is less error prone and also explicitly
recommended by the coding style.
> I don't feel that strongly about it, though, so if you love the label
> you have then no need to change it.
So I'd prefer keeping things this way.
> > @@ -67,7 +77,14 @@ static void elan_i2c_hid_power_down(struct i2chid_ops *ops)
> > struct i2c_hid_of_elan *ihid_elan =
> > container_of(ops, struct i2c_hid_of_elan, ops);
> >
> > - gpiod_set_value_cansleep(ihid_elan->reset_gpio, 1);
> > + /*
> > + * Do not assert reset when the hardware allows for it to remain
> > + * deasserted regardless of the state of the (shared) power supply to
> > + * avoid wasting power when the supply is left on.
> > + */
> > + if (!ihid_elan->no_reset_on_power_off)
> > + gpiod_set_value_cansleep(ihid_elan->reset_gpio, 1);
> > +
> > if (ihid_elan->chip_data->post_gpio_reset_off_delay_ms)
> > msleep(ihid_elan->chip_data->post_gpio_reset_off_delay_ms);
>
> Shouldn't the above two lines be inside the "if
> (!ihid_elan->no_reset_on_power_off)" test? If you're not setting the
> reset GPIO then you don't need to do the delay, right?
Yes, I guess you're right. The off-delay is weird and not normally used,
but apparently it is needed by some panel-follower use case. AFAICT it's
not even related to the reset line, just a hack to add a delay before
the panel is reset by some other driver (see f2f43bf15d7a ("HID:
i2c-hid: elan: Add ili9882t timing")).
I think that's why I just looked the other way and left this little
oddity here unchanged.
> > @@ -79,6 +96,7 @@ static void elan_i2c_hid_power_down(struct i2chid_ops *ops)
> > static int i2c_hid_of_elan_probe(struct i2c_client *client)
> > {
> > struct i2c_hid_of_elan *ihid_elan;
> > + int ret;
> >
> > ihid_elan = devm_kzalloc(&client->dev, sizeof(*ihid_elan), GFP_KERNEL);
> > if (!ihid_elan)
> > @@ -93,21 +111,38 @@ static int i2c_hid_of_elan_probe(struct i2c_client *client)
> > if (IS_ERR(ihid_elan->reset_gpio))
> > return PTR_ERR(ihid_elan->reset_gpio);
> >
> > + ihid_elan->no_reset_on_power_off = of_property_read_bool(client->dev.of_node,
> > + "no-reset-on-power-off");
>
> Personally, I'd rather you query for the property before you request
> the GPIO and then request the GPIO in the "powered off" state just to
> keep everything in the most consistent state possible.
No, I don't know what state the reset line is in before the driver
probes. So either I leave it unchanged as I did in v1 or I assert it
here unconditionally as I do in v2 (e.g. to avoid deasserting reset
before the supply is stable).
Johan
On Mon, May 20, 2024 at 01:44:06PM +0200, Johan Hovold wrote:
> On Fri, May 10, 2024 at 04:36:08PM -0700, Doug Anderson wrote:
> > On Tue, May 7, 2024 at 7:48 AM Johan Hovold <[email protected]> wrote:
> > > @@ -67,7 +77,14 @@ static void elan_i2c_hid_power_down(struct i2chid_ops *ops)
> > > struct i2c_hid_of_elan *ihid_elan =
> > > container_of(ops, struct i2c_hid_of_elan, ops);
> > >
> > > - gpiod_set_value_cansleep(ihid_elan->reset_gpio, 1);
> > > + /*
> > > + * Do not assert reset when the hardware allows for it to remain
> > > + * deasserted regardless of the state of the (shared) power supply to
> > > + * avoid wasting power when the supply is left on.
> > > + */
> > > + if (!ihid_elan->no_reset_on_power_off)
> > > + gpiod_set_value_cansleep(ihid_elan->reset_gpio, 1);
> > > +
> > > if (ihid_elan->chip_data->post_gpio_reset_off_delay_ms)
> > > msleep(ihid_elan->chip_data->post_gpio_reset_off_delay_ms);
> >
> > Shouldn't the above two lines be inside the "if
> > (!ihid_elan->no_reset_on_power_off)" test? If you're not setting the
> > reset GPIO then you don't need to do the delay, right?
>
> Yes, I guess you're right. The off-delay is weird and not normally used,
> but apparently it is needed by some panel-follower use case. AFAICT it's
> not even related to the reset line, just a hack to add a delay before
> the panel is reset by some other driver (see f2f43bf15d7a ("HID:
> i2c-hid: elan: Add ili9882t timing")).
>
> I think that's why I just looked the other way and left this little
> oddity here unchanged.
Hit send too soon.
Since this hack does not appear to be related to the reset line, I think
it's correct to not have it depend on whether the reset line is asserted
or not (e.g. as there could be 'panel-followers' with
'no_reset_on_power_off'):
The datasheet specifies there should be 60ms between touch SDA
sleep and panel RESX. Doug's series[1] allows panels and
touchscreens to power on/off together, so we can add the 65 ms
delay in i2c_hid_core_suspend before panel_unprepare.
The power-off delay variable should probably be renamed, but that's a
separate change.
So I think v2 of this series is good to go.
Johan
Hi,
On Mon, May 20, 2024 at 4:52 AM Johan Hovold <[email protected]> wrote:
>
> On Mon, May 20, 2024 at 01:44:06PM +0200, Johan Hovold wrote:
> > On Fri, May 10, 2024 at 04:36:08PM -0700, Doug Anderson wrote:
> > > On Tue, May 7, 2024 at 7:48 AM Johan Hovold <[email protected]> wrote:
>
> > > > @@ -67,7 +77,14 @@ static void elan_i2c_hid_power_down(struct i2chid_ops *ops)
> > > > struct i2c_hid_of_elan *ihid_elan =
> > > > container_of(ops, struct i2c_hid_of_elan, ops);
> > > >
> > > > - gpiod_set_value_cansleep(ihid_elan->reset_gpio, 1);
> > > > + /*
> > > > + * Do not assert reset when the hardware allows for it to remain
> > > > + * deasserted regardless of the state of the (shared) power supply to
> > > > + * avoid wasting power when the supply is left on.
> > > > + */
> > > > + if (!ihid_elan->no_reset_on_power_off)
> > > > + gpiod_set_value_cansleep(ihid_elan->reset_gpio, 1);
> > > > +
> > > > if (ihid_elan->chip_data->post_gpio_reset_off_delay_ms)
> > > > msleep(ihid_elan->chip_data->post_gpio_reset_off_delay_ms);
> > >
> > > Shouldn't the above two lines be inside the "if
> > > (!ihid_elan->no_reset_on_power_off)" test? If you're not setting the
> > > reset GPIO then you don't need to do the delay, right?
> >
> > Yes, I guess you're right. The off-delay is weird and not normally used,
> > but apparently it is needed by some panel-follower use case. AFAICT it's
> > not even related to the reset line, just a hack to add a delay before
> > the panel is reset by some other driver (see f2f43bf15d7a ("HID:
> > i2c-hid: elan: Add ili9882t timing")).
> >
> > I think that's why I just looked the other way and left this little
> > oddity here unchanged.
>
> Hit send too soon.
>
> Since this hack does not appear to be related to the reset line, I think
> it's correct to not have it depend on whether the reset line is asserted
> or not (e.g. as there could be 'panel-followers' with
> 'no_reset_on_power_off'):
>
> The datasheet specifies there should be 60ms between touch SDA
> sleep and panel RESX. Doug's series[1] allows panels and
> touchscreens to power on/off together, so we can add the 65 ms
> delay in i2c_hid_core_suspend before panel_unprepare.
>
> The power-off delay variable should probably be renamed, but that's a
> separate change.
>
> So I think v2 of this series is good to go.
Sure. As I think we've seen in the past, my choice of bikeshed paint
color seems to be quite different than yours, but nothing here seems
like it needs to block landing, so:
Reviewed-by: Douglas Anderson <[email protected]>
Hi Jiri and Benjamin,
On Tue, May 07, 2024 at 04:48:14PM +0200, Johan Hovold wrote:
> The Elan eKTH5015M touch controller on the X13s requires a 300 ms delay
> before sending commands after having deasserted reset during power on.
>
> This series switches the X13s devicetree to use the Elan specific
> binding so that the OS can determine the required power-on sequence and
> make sure that the controller is always detected during boot. [1]
> The devicetree changes are expected to go in through the Qualcomm tree
> once the binding and driver updates have been merged.
> [1] The reset signal is currently deasserted using the pin configuration
> and the controller would be detected if probe is deferred or if user
> space triggers a reprobe through sysfs.
> Johan Hovold (7):
> dt-bindings: HID: i2c-hid: add dedicated Ilitek ILI2901 schema
> dt-bindings: HID: i2c-hid: elan: add Elan eKTH5015M
> dt-bindings: HID: i2c-hid: elan: add 'no-reset-on-power-off' property
> HID: i2c-hid: elan: fix reset suspend current leakage
Could you consider picking the first four patches up for 6.10-rc3 so
that Bjorn can take the devicetree changes?
> arm64: dts: qcom: sc8280xp-x13s: fix touchscreen power on
> arm64: dts: qcom: sc8280xp-crd: use external pull up for touch reset
> arm64: defconfig: enable Elan i2c-hid driver
Johan
On Jun 05 2024, Johan Hovold wrote:
> Hi Jiri and Benjamin,
>
> On Tue, May 07, 2024 at 04:48:14PM +0200, Johan Hovold wrote:
> > The Elan eKTH5015M touch controller on the X13s requires a 300 ms delay
> > before sending commands after having deasserted reset during power on.
> >
> > This series switches the X13s devicetree to use the Elan specific
> > binding so that the OS can determine the required power-on sequence and
> > make sure that the controller is always detected during boot. [1]
>
> > The devicetree changes are expected to go in through the Qualcomm tree
> > once the binding and driver updates have been merged.
>
> > [1] The reset signal is currently deasserted using the pin configuration
> > and the controller would be detected if probe is deferred or if user
> > space triggers a reprobe through sysfs.
>
> > Johan Hovold (7):
> > dt-bindings: HID: i2c-hid: add dedicated Ilitek ILI2901 schema
> > dt-bindings: HID: i2c-hid: elan: add Elan eKTH5015M
> > dt-bindings: HID: i2c-hid: elan: add 'no-reset-on-power-off' property
> > HID: i2c-hid: elan: fix reset suspend current leakage
>
> Could you consider picking the first four patches up for 6.10-rc3 so
> that Bjorn can take the devicetree changes?
We definitely can. But if it makes things easier, Bjorn can also take
the whole series through his tree with my Acked-by.
If I don't get answer by tomorrow I'll apply the first 4 in the hid
tree.
Cheers,
Benjamin
>
> > arm64: dts: qcom: sc8280xp-x13s: fix touchscreen power on
> > arm64: dts: qcom: sc8280xp-crd: use external pull up for touch reset
> > arm64: defconfig: enable Elan i2c-hid driver
>
> Johan
On Thu, Jun 06, 2024 at 08:57:47AM +0200, Benjamin Tissoires wrote:
> On Jun 05 2024, Johan Hovold wrote:
> > Hi Jiri and Benjamin,
> >
> > On Tue, May 07, 2024 at 04:48:14PM +0200, Johan Hovold wrote:
> > > Johan Hovold (7):
> > > dt-bindings: HID: i2c-hid: add dedicated Ilitek ILI2901 schema
> > > dt-bindings: HID: i2c-hid: elan: add Elan eKTH5015M
> > > dt-bindings: HID: i2c-hid: elan: add 'no-reset-on-power-off' property
> > > HID: i2c-hid: elan: fix reset suspend current leakage
> >
> > Could you consider picking the first four patches up for 6.10-rc3 so
> > that Bjorn can take the devicetree changes?
>
> We definitely can. But if it makes things easier, Bjorn can also take
> the whole series through his tree with my Acked-by.
Thanks, but it should be fine to take this through two different trees.
It will probably take a little longer to get the DT changes into
mainline anyway as they will also go through the SoC tree.
> > > arm64: dts: qcom: sc8280xp-x13s: fix touchscreen power on
> > > arm64: dts: qcom: sc8280xp-crd: use external pull up for touch reset
> > > arm64: defconfig: enable Elan i2c-hid driver
Johan
On Tue, 07 May 2024 16:48:14 +0200, Johan Hovold wrote:
> The Elan eKTH5015M touch controller on the X13s requires a 300 ms delay
> before sending commands after having deasserted reset during power on.
>
> This series switches the X13s devicetree to use the Elan specific
> binding so that the OS can determine the required power-on sequence and
> make sure that the controller is always detected during boot. [1]
>
> [...]
Applied to hid/hid.git (for-6.10/upstream-fixes), thanks!
[1/7] dt-bindings: HID: i2c-hid: add dedicated Ilitek ILI2901 schema
https://git.kernel.org/hid/hid/c/8d3ae46c6433
[2/7] dt-bindings: HID: i2c-hid: elan: add Elan eKTH5015M
https://git.kernel.org/hid/hid/c/07fc16fa5552
[3/7] dt-bindings: HID: i2c-hid: elan: add 'no-reset-on-power-off' property
https://git.kernel.org/hid/hid/c/e538d4b85b8f
[4/7] HID: i2c-hid: elan: fix reset suspend current leakage
https://git.kernel.org/hid/hid/c/0eafc58f2194
Cheers,
--
Benjamin Tissoires <[email protected]>
On Jun 06 2024, Johan Hovold wrote:
> On Thu, Jun 06, 2024 at 08:57:47AM +0200, Benjamin Tissoires wrote:
> > On Jun 05 2024, Johan Hovold wrote:
> > > Hi Jiri and Benjamin,
> > >
> > > On Tue, May 07, 2024 at 04:48:14PM +0200, Johan Hovold wrote:
>
> > > > Johan Hovold (7):
> > > > dt-bindings: HID: i2c-hid: add dedicated Ilitek ILI2901 schema
> > > > dt-bindings: HID: i2c-hid: elan: add Elan eKTH5015M
> > > > dt-bindings: HID: i2c-hid: elan: add 'no-reset-on-power-off' property
> > > > HID: i2c-hid: elan: fix reset suspend current leakage
> > >
> > > Could you consider picking the first four patches up for 6.10-rc3 so
> > > that Bjorn can take the devicetree changes?
> >
> > We definitely can. But if it makes things easier, Bjorn can also take
> > the whole series through his tree with my Acked-by.
>
> Thanks, but it should be fine to take this through two different trees.
>
> It will probably take a little longer to get the DT changes into
> mainline anyway as they will also go through the SoC tree.
Alright, fair enough. I've applied them, and will let them sink in
for-next for 24h. I'll send the PR to Linus tomorrow evening. No
guarantees they'll make -rc3 (but they should be applied early next week
unless I messed something big).
Cheers,
Benjamin
On Tue, 07 May 2024 16:48:14 +0200, Johan Hovold wrote:
> The Elan eKTH5015M touch controller on the X13s requires a 300 ms delay
> before sending commands after having deasserted reset during power on.
>
> This series switches the X13s devicetree to use the Elan specific
> binding so that the OS can determine the required power-on sequence and
> make sure that the controller is always detected during boot. [1]
>
> [...]
Applied, thanks!
[7/7] arm64: defconfig: enable Elan i2c-hid driver
commit: e706474d8428f420bba11f2c49c3083fd1b31d88
Best regards,
--
Bjorn Andersson <[email protected]>