Merge branch 'for-6.8/elan' into for-linus

- support for Ilitek ili2901 touchscreen (Zhengqiao Xia)
This commit is contained in:
Jiri Kosina 2024-01-08 21:01:34 +01:00
commit 39e7facbe5
2 changed files with 11 additions and 2 deletions

View File

@ -18,8 +18,9 @@ allOf:
properties:
compatible:
items:
- const: elan,ekth6915
enum:
- elan,ekth6915
- ilitek,ili2901
reg:
const: 0x10

View File

@ -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);