diff options
| author | Benjamin Tissoires <bentiss@kernel.org> | 2024-09-13 15:27:27 +0200 |
|---|---|---|
| committer | Benjamin Tissoires <bentiss@kernel.org> | 2024-09-13 15:27:27 +0200 |
| commit | c9ce59650e5d57b986fdd4a599a46e28ccabb4d6 (patch) | |
| tree | d7b946a0af361a0ba276cbbbaa60a7d8f8e38e8d /drivers/hid/i2c-hid | |
| parent | Merge branch 'for-6.12/hid-playstation' into for-linus (diff) | |
| parent | HID: i2c-hid: elan: Add elan-ekth6a12nay timing (diff) | |
| download | linux-c9ce59650e5d57b986fdd4a599a46e28ccabb4d6.tar.xz linux-c9ce59650e5d57b986fdd4a599a46e28ccabb4d6.zip | |
Merge branch 'for-6.12/elan' into for-linus
- Add support for one new Elan device (ekth6a12nay) (Zhaoxiong Lv)
Diffstat (limited to 'drivers/hid/i2c-hid')
| -rw-r--r-- | drivers/hid/i2c-hid/i2c-hid-of-elan.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/hid/i2c-hid/i2c-hid-of-elan.c b/drivers/hid/i2c-hid/i2c-hid-of-elan.c index 091e37933225..3fcff6daa0d3 100644 --- a/drivers/hid/i2c-hid/i2c-hid-of-elan.c +++ b/drivers/hid/i2c-hid/i2c-hid-of-elan.c @@ -152,6 +152,13 @@ static const struct elan_i2c_hid_chip_data elan_ekth6915_chip_data = { .main_supply_name = "vcc33", }; +static const struct elan_i2c_hid_chip_data elan_ekth6a12nay_chip_data = { + .post_power_delay_ms = 10, + .post_gpio_reset_on_delay_ms = 300, + .hid_descriptor_address = 0x0001, + .main_supply_name = "vcc33", +}; + static const struct elan_i2c_hid_chip_data ilitek_ili9882t_chip_data = { .post_power_delay_ms = 1, .post_gpio_reset_on_delay_ms = 200, @@ -174,6 +181,7 @@ static const struct elan_i2c_hid_chip_data ilitek_ili2901_chip_data = { static const struct of_device_id elan_i2c_hid_of_match[] = { { .compatible = "elan,ekth6915", .data = &elan_ekth6915_chip_data }, + { .compatible = "elan,ekth6a12nay", .data = &elan_ekth6a12nay_chip_data }, { .compatible = "ilitek,ili9882t", .data = &ilitek_ili9882t_chip_data }, { .compatible = "ilitek,ili2901", .data = &ilitek_ili2901_chip_data }, { } |