diff mbox series

add alps devices to the hid-ids.h

Message ID 20200522090937.5917-1-Shirleyxcy@gmail.com (mailing list archive)
State New
Delegated to: Jiri Kosina
Headers show
Series add alps devices to the hid-ids.h | expand

Commit Message

Caiyuan Xie May 22, 2020, 9:09 a.m. UTC
<Change List>
--Add ALPS devices 

Signed-off-by: Caiyuan Xie <caiyuan.xie@cn.alps.com>
---
 drivers/hid/hid-ids.h | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

Comments

Jiri Kosina June 16, 2020, 3:32 p.m. UTC | #1
On Fri, 22 May 2020, Caiyuan Xie wrote:

> <Change List>
> --Add ALPS devices 

Please explain in the changelog why we want those device IDs added, 
especially as nothing in the code relies on these constants.

> 
> Signed-off-by: Caiyuan Xie <caiyuan.xie@cn.alps.com>
> ---
>  drivers/hid/hid-ids.h | 28 ++++++++++++++++------------
>  1 file changed, 16 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index 1c71a1aa76b2..db318e6a1ad1 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
[ ... snip ... ]
>  #define USB_VENDOR_ID_AMI		0x046b
>  #define USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE	0xff10
>  
> @@ -385,7 +400,6 @@
>  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7349	0x7349
>  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_73F7	0x73f7
>  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001	0xa001
> -#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_C002	0xc002
>  
>  #define USB_VENDOR_ID_ELAN		0x04f3
>  #define USB_DEVICE_ID_TOSHIBA_CLICK_L9W	0x0401
> @@ -465,10 +479,6 @@
>  #define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_010A 0x010a
>  #define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_E100 0xe100
>  
> -#define USB_VENDOR_ID_GLORIOUS  0x258a
> -#define USB_DEVICE_ID_GLORIOUS_MODEL_D 0x0033
> -#define USB_DEVICE_ID_GLORIOUS_MODEL_O 0x0036
> -
>  #define I2C_VENDOR_ID_GOODIX		0x27c6
>  #define I2C_DEVICE_ID_GOODIX_01F0	0x01f0
>  
> @@ -760,7 +770,6 @@
>  #define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2	0xc218
>  #define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2	0xc219
>  #define USB_DEVICE_ID_LOGITECH_G15_LCD		0xc222
> -#define USB_DEVICE_ID_LOGITECH_G11		0xc225
>  #define USB_DEVICE_ID_LOGITECH_G15_V2_LCD	0xc227
>  #define USB_DEVICE_ID_LOGITECH_G510		0xc22d
>  #define USB_DEVICE_ID_LOGITECH_G510_USB_AUDIO	0xc22e
> @@ -827,7 +836,6 @@
>  #define USB_DEVICE_ID_PICK16F1454	0x0042
>  #define USB_DEVICE_ID_PICK16F1454_V2	0xf2f7
>  #define USB_DEVICE_ID_LUXAFOR		0xf372
> -#define USB_DEVICE_ID_MCP2221		0x00dd
>  
>  #define USB_VENDOR_ID_MICROSOFT		0x045e
>  #define USB_DEVICE_ID_SIDEWINDER_GV	0x003b
> @@ -1099,9 +1107,6 @@
>  #define USB_DEVICE_ID_SYMBOL_SCANNER_2	0x1300
>  #define USB_DEVICE_ID_SYMBOL_SCANNER_3	0x1200
>  
> -#define I2C_VENDOR_ID_SYNAPTICS     0x06cb
> -#define I2C_PRODUCT_ID_SYNAPTICS_SYNA2393   0x7a13
> -
>  #define USB_VENDOR_ID_SYNAPTICS		0x06cb
>  #define USB_DEVICE_ID_SYNAPTICS_TP	0x0001
>  #define USB_DEVICE_ID_SYNAPTICS_INT_TP	0x0002
> @@ -1116,7 +1121,6 @@
>  #define USB_DEVICE_ID_SYNAPTICS_LTS2	0x1d10
>  #define USB_DEVICE_ID_SYNAPTICS_HD	0x0ac3
>  #define USB_DEVICE_ID_SYNAPTICS_QUAD_HD	0x1ac3
> -#define USB_DEVICE_ID_SYNAPTICS_DELL_K12A	0x2819
>  #define USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5_012	0x2968
>  #define USB_DEVICE_ID_SYNAPTICS_TP_V103	0x5710
>  #define USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5	0x81a7

What are all these unrelated changes about?
Jiri Kosina June 17, 2020, 4:31 p.m. UTC | #2
On Wed, 17 Jun 2020, Caiyuan Xie wrote:

> Thanks for your check. We will need to support those device IDs in 
> future, so we added them for future use.

Please add them once you have code making actual use of them in the 
driver, otherwise it's a bit pointless to maintain such unused list in the 
kernel headers.

Thanks again,
diff mbox series

Patch

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 1c71a1aa76b2..db318e6a1ad1 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -78,11 +78,26 @@ 
 #define HID_DEVICE_ID_ALPS_U1_DUAL	0x120B
 #define HID_DEVICE_ID_ALPS_U1_DUAL_PTP	0x121F
 #define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP	0x1220
-#define HID_DEVICE_ID_ALPS_U1		0x1215
+#define HID_DEVICE_ID_ALPS_U1_OLDMAN		0x1215
 #define HID_DEVICE_ID_ALPS_U1_UNICORN_LEGACY         0x121E
 #define HID_DEVICE_ID_ALPS_T4_BTNLESS	0x120C
 #define HID_DEVICE_ID_ALPS_1222		0x1222
 
+#define HID_DEVICE_ID_ALPS_COSMO		0x1202
+#define HID_DEVICE_ID_ALPS_T4_MERITAGE		0x120D
+#define HID_DEVICE_ID_ALPS_U1		0x1209
+#define HID_DEVICE_ID_ALPS_U1_PTP_1		0x1207
+#define HID_DEVICE_ID_ALPS_U1_PTP_2		0x120A
+#define HID_DEVICE_ID_ALPS_U1_FW_PTP		0x120A
+#define HID_DEVICE_ID_ALPS_T4_PRADA			0x1216
+#define HID_DEVICE_ID_ALPS_T4_NOX_GIA		0x1217
+#define HID_DEVICE_ID_ALPS_FW_PTP_AP1		0x121B
+#define HID_DEVICE_ID_ALPS_FW_PTP_CP1		0x121C
+#define HID_DEVICE_ID_ALPS_MEGATRON		0x121A
+#define HID_DEVICE_ID_ALPS_KICKBACK		0x121D
+
+
+
 #define USB_VENDOR_ID_AMI		0x046b
 #define USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE	0xff10
 
@@ -385,7 +400,6 @@ 
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7349	0x7349
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_73F7	0x73f7
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001	0xa001
-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_C002	0xc002
 
 #define USB_VENDOR_ID_ELAN		0x04f3
 #define USB_DEVICE_ID_TOSHIBA_CLICK_L9W	0x0401
@@ -465,10 +479,6 @@ 
 #define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_010A 0x010a
 #define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_E100 0xe100
 
-#define USB_VENDOR_ID_GLORIOUS  0x258a
-#define USB_DEVICE_ID_GLORIOUS_MODEL_D 0x0033
-#define USB_DEVICE_ID_GLORIOUS_MODEL_O 0x0036
-
 #define I2C_VENDOR_ID_GOODIX		0x27c6
 #define I2C_DEVICE_ID_GOODIX_01F0	0x01f0
 
@@ -760,7 +770,6 @@ 
 #define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2	0xc218
 #define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2	0xc219
 #define USB_DEVICE_ID_LOGITECH_G15_LCD		0xc222
-#define USB_DEVICE_ID_LOGITECH_G11		0xc225
 #define USB_DEVICE_ID_LOGITECH_G15_V2_LCD	0xc227
 #define USB_DEVICE_ID_LOGITECH_G510		0xc22d
 #define USB_DEVICE_ID_LOGITECH_G510_USB_AUDIO	0xc22e
@@ -827,7 +836,6 @@ 
 #define USB_DEVICE_ID_PICK16F1454	0x0042
 #define USB_DEVICE_ID_PICK16F1454_V2	0xf2f7
 #define USB_DEVICE_ID_LUXAFOR		0xf372
-#define USB_DEVICE_ID_MCP2221		0x00dd
 
 #define USB_VENDOR_ID_MICROSOFT		0x045e
 #define USB_DEVICE_ID_SIDEWINDER_GV	0x003b
@@ -1099,9 +1107,6 @@ 
 #define USB_DEVICE_ID_SYMBOL_SCANNER_2	0x1300
 #define USB_DEVICE_ID_SYMBOL_SCANNER_3	0x1200
 
-#define I2C_VENDOR_ID_SYNAPTICS     0x06cb
-#define I2C_PRODUCT_ID_SYNAPTICS_SYNA2393   0x7a13
-
 #define USB_VENDOR_ID_SYNAPTICS		0x06cb
 #define USB_DEVICE_ID_SYNAPTICS_TP	0x0001
 #define USB_DEVICE_ID_SYNAPTICS_INT_TP	0x0002
@@ -1116,7 +1121,6 @@ 
 #define USB_DEVICE_ID_SYNAPTICS_LTS2	0x1d10
 #define USB_DEVICE_ID_SYNAPTICS_HD	0x0ac3
 #define USB_DEVICE_ID_SYNAPTICS_QUAD_HD	0x1ac3
-#define USB_DEVICE_ID_SYNAPTICS_DELL_K12A	0x2819
 #define USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5_012	0x2968
 #define USB_DEVICE_ID_SYNAPTICS_TP_V103	0x5710
 #define USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5	0x81a7