diff options
| author | Jiri Kosina <[email protected]> | 2024-01-08 21:01:34 +0100 |
|---|---|---|
| committer | Jiri Kosina <[email protected]> | 2024-01-08 21:01:34 +0100 |
| commit | 39e7facbe5eaa5e1bf25d44116e0a96376bc928b (patch) | |
| tree | 391dcc987c7cc76161a4e735b2f64ef354552d74 | |
| parent | 6b93f350e55f3f2ee071dd41109d936abfba8ebf (diff) | |
| parent | 03ddb7de012c68d727509c4f6e0c0fa1ebc81668 (diff) | |
Merge branch 'for-6.8/elan' into for-linus
- support for Ilitek ili2901 touchscreen (Zhengqiao Xia)
| -rw-r--r-- | Documentation/devicetree/bindings/input/elan,ekth6915.yaml | 5 | ||||
| -rw-r--r-- | drivers/hid/i2c-hid/i2c-hid-of-elan.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/input/elan,ekth6915.yaml b/Documentation/devicetree/bindings/input/elan,ekth6915.yaml index 3e2d216c6432..dc4ac41f2441 100644 --- a/Documentation/devicetree/bindings/input/elan,ekth6915.yaml +++ b/Documentation/devicetree/bindings/input/elan,ekth6915.yaml @@ -18,8 +18,9 @@ allOf: properties: compatible: - items: - - const: elan,ekth6915 + enum: + - elan,ekth6915 + - ilitek,ili2901 reg: const: 0x10 diff --git a/drivers/hid/i2c-hid/i2c-hid-of-elan.c b/drivers/hid/i2c-hid/i2c-hid-of-elan.c index 31abab57ad44..5b91fb106cfc 100644 --- a/drivers/hid/i2c-hid/i2c-hid-of-elan.c +++ b/drivers/hid/i2c-hid/i2c-hid-of-elan.c @@ -130,9 +130,17 @@ static const struct elan_i2c_hid_chip_data ilitek_ili9882t_chip_data = { .main_supply_name = NULL, }; +static const struct elan_i2c_hid_chip_data ilitek_ili2901_chip_data = { + .post_power_delay_ms = 10, + .post_gpio_reset_on_delay_ms = 100, + .hid_descriptor_address = 0x0001, + .main_supply_name = "vcc33", +}; + static const struct of_device_id elan_i2c_hid_of_match[] = { { .compatible = "elan,ekth6915", .data = &elan_ekth6915_chip_data }, { .compatible = "ilitek,ili9882t", .data = &ilitek_ili9882t_chip_data }, + { .compatible = "ilitek,ili2901", .data = &ilitek_ili2901_chip_data }, { } }; MODULE_DEVICE_TABLE(of, elan_i2c_hid_of_match); |