Commit c9ce5965 authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

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

- Add support for one new Elan device (ekth6a12nay) (Zhaoxiong Lv)
parents 54ab9273 d06651be

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

+3 −1
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ properties: 
          - enum:

              - elan,ekth5015m

          - const: elan,ekth6915

      - const: elan,ekth6915

      - enum:

          - elan,ekth6915

          - elan,ekth6a12nay



  reg:

    const: 0x10

drivers/hid/hid-ids.h

+0 −16
Original line number Diff line number Diff line
@@ -417,24 +417,8 @@ 
#define USB_DEVICE_ID_TOSHIBA_CLICK_L9W	0x0401

#define USB_DEVICE_ID_HP_X2		0x074d

#define USB_DEVICE_ID_HP_X2_10_COVER	0x0755

#define I2C_DEVICE_ID_HP_ENVY_X360_15	0x2d05

#define I2C_DEVICE_ID_HP_ENVY_X360_15T_DR100	0x29CF

#define I2C_DEVICE_ID_HP_ENVY_X360_EU0009NV	0x2CF9

#define I2C_DEVICE_ID_HP_SPECTRE_X360_15	0x2817

#define I2C_DEVICE_ID_HP_SPECTRE_X360_13_AW0020NG  0x29DF

#define I2C_DEVICE_ID_ASUS_TP420IA_TOUCHSCREEN 0x2BC8

#define I2C_DEVICE_ID_ASUS_GV301RA_TOUCHSCREEN 0x2C82

#define I2C_DEVICE_ID_ASUS_UX3402_TOUCHSCREEN 0x2F2C

#define I2C_DEVICE_ID_ASUS_UX6404_TOUCHSCREEN 0x4116

#define USB_DEVICE_ID_ASUS_UX550VE_TOUCHSCREEN	0x2544

#define USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN	0x2706

#define I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN	0x261A

#define I2C_DEVICE_ID_SURFACE_GO2_TOUCHSCREEN	0x2A1C

#define I2C_DEVICE_ID_LENOVO_YOGA_C630_TOUCHSCREEN	0x279F

#define I2C_DEVICE_ID_HP_SPECTRE_X360_13T_AW100	0x29F5

#define I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V1	0x2BED

#define I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V2	0x2BEE

#define I2C_DEVICE_ID_HP_ENVY_X360_15_EU0556NG		0x2D02

#define I2C_DEVICE_ID_CHROMEBOOK_TROGDOR_POMPOM	0x2F81



#define USB_VENDOR_ID_ELECOM		0x056e

drivers/hid/hid-input.c

+5 −32
Original line number Diff line number Diff line
@@ -373,14 +373,6 @@ static const struct hid_device_id hid_battery_quirks[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH,

		USB_DEVICE_ID_LOGITECH_DINOVO_EDGE_KBD),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_ASUS_TP420IA_TOUCHSCREEN),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_ASUS_GV301RA_TOUCHSCREEN),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_ASUS_UX3402_TOUCHSCREEN),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_ASUS_UX6404_TOUCHSCREEN),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ASUS_UX550VE_TOUCHSCREEN),
@@ -391,32 +383,13 @@ static const struct hid_device_id hid_battery_quirks[] = { 
	  HID_BATTERY_QUIRK_AVOID_QUERY },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_SW),

	  HID_BATTERY_QUIRK_AVOID_QUERY },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15T_DR100),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_EU0009NV),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_15),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_13_AW0020NG),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_SURFACE_GO2_TOUCHSCREEN),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_LENOVO_YOGA_C630_TOUCHSCREEN),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_13T_AW100),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V1),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V2),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15_EU0556NG),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_CHROMEBOOK_TROGDOR_POMPOM),

	  HID_BATTERY_QUIRK_AVOID_QUERY },

	/*

	 * Elan I2C-HID touchscreens seem to all report a non present battery,

	 * set HID_BATTERY_QUIRK_IGNORE for all Elan I2C-HID devices.

	 */

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, HID_ANY_ID), HID_BATTERY_QUIRK_IGNORE },

	{}

};

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

+8 −0
Original line number Diff line number Diff line
@@ -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 },

	{ }