From: Jiri Kosina <jkosina@suse.cz>
Date: Sat, 5 May 2012 21:30:42 +0000 (+0200)
Subject: Merge branch 'multitouch' into device-groups
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=645832cce2955bdcd0c3166478b84ea7afd0ea53;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge branch 'multitouch' into device-groups

I am merging multitouch branch into device-groups so that support
for Baanto device can be adjusted accordingly to the new autoloading
patches.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---

645832cce2955bdcd0c3166478b84ea7afd0ea53
diff --cc drivers/hid/hid-core.c
index 0a107fe7e52,7e7db307664..df2ca0af855
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@ -1496,9 -1385,17 +1496,10 @@@ static const struct hid_device_id hid_h
  	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
 -	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT) },
 -	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUSTEK_MULTITOUCH_YFO) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_BAANTO, USB_DEVICE_ID_BAANTO_MT_190W2), },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) },
 -	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_PIXCIR_MULTI_TOUCH) },
 -	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) },
 -	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_10_1) },
 -	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },
 -	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
diff --cc drivers/hid/hid-multitouch.c
index b10c2044d89,b929883e8a5..ece7cef915a
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@@ -754,24 -743,28 +754,28 @@@ static const struct hid_device_id mt_de
  
  	/* Atmel panels */
  	{ .driver_data = MT_CLS_SERIAL,
 -		HID_USB_DEVICE(USB_VENDOR_ID_ATMEL,
 +		MT_USB_DEVICE(USB_VENDOR_ID_ATMEL,
  			USB_DEVICE_ID_ATMEL_MULTITOUCH) },
  	{ .driver_data = MT_CLS_SERIAL,
 -		HID_USB_DEVICE(USB_VENDOR_ID_ATMEL,
 +		MT_USB_DEVICE(USB_VENDOR_ID_ATMEL,
  			USB_DEVICE_ID_ATMEL_MXT_DIGITIZER) },
  
+ 	/* Baanto multitouch devices */
+ 	{ .driver_data = MT_CLS_DEFAULT,
+ 		HID_USB_DEVICE(USB_VENDOR_ID_BAANTO,
+ 			USB_DEVICE_ID_BAANTO_MT_190W2) },
  	/* Cando panels */
  	{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,
 -		HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
 +		MT_USB_DEVICE(USB_VENDOR_ID_CANDO,
  			USB_DEVICE_ID_CANDO_MULTI_TOUCH) },
  	{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,
 -		HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
 +		MT_USB_DEVICE(USB_VENDOR_ID_CANDO,
  			USB_DEVICE_ID_CANDO_MULTI_TOUCH_10_1) },
  	{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,
 -		HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
 +		MT_USB_DEVICE(USB_VENDOR_ID_CANDO,
  			USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },
  	{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,
 -		HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
 +		MT_USB_DEVICE(USB_VENDOR_ID_CANDO,
  			USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) },
  
  	/* Chunghwa Telecom touch panels */