Skip to content

Commit 39e7fac

Browse files
author
Jiri Kosina
committed
Merge branch 'for-6.8/elan' into for-linus
- support for Ilitek ili2901 touchscreen (Zhengqiao Xia)
2 parents 6b93f35 + 03ddb7d commit 39e7fac

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

Documentation/devicetree/bindings/input/elan,ekth6915.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ allOf:
1818

1919
properties:
2020
compatible:
21-
items:
22-
- const: elan,ekth6915
21+
enum:
22+
- elan,ekth6915
23+
- ilitek,ili2901
2324

2425
reg:
2526
const: 0x10

drivers/hid/i2c-hid/i2c-hid-of-elan.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,17 @@ static const struct elan_i2c_hid_chip_data ilitek_ili9882t_chip_data = {
130130
.main_supply_name = NULL,
131131
};
132132

133+
static const struct elan_i2c_hid_chip_data ilitek_ili2901_chip_data = {
134+
.post_power_delay_ms = 10,
135+
.post_gpio_reset_on_delay_ms = 100,
136+
.hid_descriptor_address = 0x0001,
137+
.main_supply_name = "vcc33",
138+
};
139+
133140
static const struct of_device_id elan_i2c_hid_of_match[] = {
134141
{ .compatible = "elan,ekth6915", .data = &elan_ekth6915_chip_data },
135142
{ .compatible = "ilitek,ili9882t", .data = &ilitek_ili9882t_chip_data },
143+
{ .compatible = "ilitek,ili2901", .data = &ilitek_ili2901_chip_data },
136144
{ }
137145
};
138146
MODULE_DEVICE_TABLE(of, elan_i2c_hid_of_match);

0 commit comments

Comments
 (0)