From 98656615437f2ef090622c1b70ebb94fb6ccaa31 Mon Sep 17 00:00:00 2001 From: Chris KIM Date: Wed, 19 Dec 2018 14:55:56 +0900 Subject: [PATCH 1/2] ODROID-N2: Add Touch driver features. CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_PROPERTIES=y CONFIG_TOUCHSCREEN_DWAV_USB_MT=y CONFIG_HID_MULTITOUCH=y Change-Id: Ic25e68c55e1443f4734ac8660b250de79823d085 --- arch/arm64/configs/odroidn2_android_defconfig | 61 ++++++++++++++++++- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/odroidn2_android_defconfig b/arch/arm64/configs/odroidn2_android_defconfig index 87109d9341f4..a6dcf6c5e105 100644 --- a/arch/arm64/configs/odroidn2_android_defconfig +++ b/arch/arm64/configs/odroidn2_android_defconfig @@ -2210,7 +2210,64 @@ CONFIG_JOYSTICK_XPAD=y CONFIG_JOYSTICK_XPAD_FF=y CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_INPUT_TABLET is not set -# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_PROPERTIES=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set +# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_AR1021_I2C is not set +# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set +# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set +# CONFIG_TOUCHSCREEN_BU21013 is not set +# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set +# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set +# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set +# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set +# CONFIG_TOUCHSCREEN_DYNAPRO is not set +# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set +# CONFIG_TOUCHSCREEN_EETI is not set +# CONFIG_TOUCHSCREEN_EGALAX is not set +# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GOODIX is not set +# CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_EKTF2127 is not set +# CONFIG_TOUCHSCREEN_ELAN is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_WACOM_I2C is not set +# CONFIG_TOUCHSCREEN_MAX11801 is not set +# CONFIG_TOUCHSCREEN_MCS5000 is not set +# CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_PIXCIR is not set +# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC_SERIO is not set +# CONFIG_TOUCHSCREEN_TSC2004 is not set +# CONFIG_TOUCHSCREEN_TSC2005 is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_TOUCHSCREEN_RM_TS is not set +# CONFIG_TOUCHSCREEN_SILEAD is not set +# CONFIG_TOUCHSCREEN_SIS_I2C is not set +# CONFIG_TOUCHSCREEN_ST1232 is not set +# CONFIG_TOUCHSCREEN_SUR40 is not set +# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set +# CONFIG_TOUCHSCREEN_SX8654 is not set +# CONFIG_TOUCHSCREEN_TPS6507X is not set +# CONFIG_TOUCHSCREEN_ZFORCE is not set +# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set +CONFIG_TOUCHSCREEN_DWAV_USB_MT=y CONFIG_INPUT_MISC=y # CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_ATMEL_CAPTOUCH is not set @@ -3404,7 +3461,7 @@ CONFIG_HID_GENERIC=y # CONFIG_HID_MAGICMOUSE is not set # CONFIG_HID_MICROSOFT is not set # CONFIG_HID_MONTEREY is not set -# CONFIG_HID_MULTITOUCH is not set +CONFIG_HID_MULTITOUCH=y # CONFIG_HID_NTRIG is not set # CONFIG_HID_ORTEK is not set # CONFIG_HID_PANTHERLORD is not set From 4a6cf7d8bb0083f3fecc5494955eff1b408b9e46 Mon Sep 17 00:00:00 2001 From: "charles.park" Date: Mon, 18 Jul 2016 09:56:31 +0900 Subject: [PATCH 2/2] ODROID: New touch product added.(HID Raw) Change-Id: I7b5d5e63515b5480e902e6665dd01df3653e3758 --- drivers/input/touchscreen/dwav-usb-mt.c | 141 ++++++++++++++++++------ 1 file changed, 108 insertions(+), 33 deletions(-) diff --git a/drivers/input/touchscreen/dwav-usb-mt.c b/drivers/input/touchscreen/dwav-usb-mt.c index 07b5f2653e9f..e72f9f39bca7 100644 --- a/drivers/input/touchscreen/dwav-usb-mt.c +++ b/drivers/input/touchscreen/dwav-usb-mt.c @@ -15,16 +15,62 @@ #include -#define DWAV_TOUCH_MAX_X 800 -#define DWAV_TOUCH_MAX_Y 480 -#define DWAV_TOUCH_MAX_ID 5 -#define DWAV_TOUCH_MAX_PRESSURE 255 +/*-------------------------------------------------------------------------*/ +#define USB_VENDOR_ID_DWAV 0x0eef /* 800 x 480, 7" DWAV touch */ +#define USB_DEVICE_ID_VU7 0x0005 -#define USB_VENDOR_ID_DWAV 0x0eef -#define USB_DEVICE_ID_DWAV_MULTITOUCH 0x0005 +#define USB_VENDOR_ID_ODROID 0x16b4 +#define USB_DEVICE_ID_VU5 0x0704 +#define USB_DEVICE_ID_VU7PLUS 0x0705 +enum { + ODROID_VU7 = 0, /* 800 x 480, 7" Touch */ + ODROID_VU5, /* 800 x 480, 5" Touch */ + ODROID_VU7PLUS, /* 1024 x 600, 7" Touch */ +}; + +/*-------------------------------------------------------------------------*/ +struct usbtouch_device_info { + char name[64]; + int max_x; + int max_y; + int max_press; + int max_finger; +}; + +/*-------------------------------------------------------------------------*/ +const struct usbtouch_device_info DEV_INFO[] = { + [ODROID_VU7] = { + .name = "ODROID VU7 MultiTouch(800x480)", + .max_x = 800, + .max_y = 480, + .max_press = 255, + .max_finger = 5, + }, + [ODROID_VU5] = { + .name = "ODROID VU5 MultiTouch(800x480)", + .max_x = 800, + .max_y = 480, + .max_press = 255, + .max_finger = 5, + }, + [ODROID_VU7PLUS] = { + .name = "ODROID VU7 Plus MultiTouch(1024x600)", + .max_x = 1024, + .max_y = 600, + .max_press = 255, + .max_finger = 5, + }, +}; + +/*-------------------------------------------------------------------------*/ static const struct usb_device_id dwav_usb_mt_devices[] = { - {USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_MULTITOUCH), 0}, + {USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_VU7), + .driver_info = ODROID_VU7}, + {USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU5), + .driver_info = ODROID_VU5}, + {USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU7PLUS), + .driver_info = ODROID_VU7PLUS}, {} }; @@ -62,31 +108,38 @@ struct finger_t { } __packed; struct dwav_usb_mt { - char name[128], phys[64]; + char name[128], phys[64]; + int dev_id; /* for URB Data DMA */ - dma_addr_t data_dma; - unsigned char *data; - int data_size; + dma_addr_t data_dma; + unsigned char *data; + int data_size; - struct urb *irq; - struct usb_interface *interface; - struct input_dev *input; + struct urb *irq; + struct usb_interface *interface; + struct input_dev *input; - struct finger_t *finger; + struct finger_t *finger; }; +/*-------------------------------------------------------------------------*/ static void dwav_usb_mt_report(struct dwav_usb_mt *dwav_usb_mt) { - int id; + int id, max_x, max_y, max_press, max_finger; - for (id = 0; id < DWAV_TOUCH_MAX_ID; id++) { + max_x = DEV_INFO[dwav_usb_mt->dev_id].max_x; + max_y = DEV_INFO[dwav_usb_mt->dev_id].max_y; + max_press = DEV_INFO[dwav_usb_mt->dev_id].max_press; + max_finger = DEV_INFO[dwav_usb_mt->dev_id].max_finger; + + for (id = 0; id < max_finger; id++) { if (dwav_usb_mt->finger[id].status == TS_EVENT_UNKNOWN) continue; - if (dwav_usb_mt->finger[id].x >= DWAV_TOUCH_MAX_X || - dwav_usb_mt->finger[id].y >= DWAV_TOUCH_MAX_Y) + if (dwav_usb_mt->finger[id].x >= max_x || + dwav_usb_mt->finger[id].y >= max_y) continue; input_mt_slot(dwav_usb_mt->input, id); @@ -102,7 +155,7 @@ static void dwav_usb_mt_report(struct dwav_usb_mt *dwav_usb_mt) dwav_usb_mt->finger[id].y); input_report_abs(dwav_usb_mt->input, ABS_MT_PRESSURE, - DWAV_TOUCH_MAX_PRESSURE); + max_press); } else { input_mt_report_slot_state(dwav_usb_mt->input, MT_TOOL_FINGER, false); @@ -113,6 +166,7 @@ static void dwav_usb_mt_report(struct dwav_usb_mt *dwav_usb_mt) } } +/*-------------------------------------------------------------------------*/ static void dwav_usb_mt_process(struct dwav_usb_mt *dwav_usb_mt, unsigned char *pkt, int len) { @@ -120,7 +174,8 @@ static void dwav_usb_mt_process(struct dwav_usb_mt *dwav_usb_mt, unsigned char bit_mask, cnt; for (cnt = 0, bit_mask = 0x01; - cnt < DWAV_TOUCH_MAX_ID; cnt++, bit_mask <<= 1) { + cnt < DEV_INFO[dwav_usb_mt->dev_id].max_finger; + cnt++, bit_mask <<= 1) { if ((dwav_raw->ids & bit_mask) && dwav_raw->press) { dwav_usb_mt->finger[cnt].status = TS_EVENT_PRESS; switch (cnt) { @@ -169,6 +224,7 @@ static void dwav_usb_mt_process(struct dwav_usb_mt *dwav_usb_mt, dwav_usb_mt_report(dwav_usb_mt); } +/*-------------------------------------------------------------------------*/ static void dwav_usb_mt_irq(struct urb *urb) { struct dwav_usb_mt *dwav_usb_mt = urb->context; @@ -209,6 +265,7 @@ exit: } } +/*-------------------------------------------------------------------------*/ static int dwav_usb_mt_open(struct input_dev *input) { struct dwav_usb_mt *dwav_usb_mt = input_get_drvdata(input); @@ -232,6 +289,7 @@ out: return r; } +/*-------------------------------------------------------------------------*/ static void dwav_usb_mt_close(struct input_dev *input) { struct dwav_usb_mt *dwav_usb_mt = input_get_drvdata(input); @@ -246,6 +304,7 @@ static void dwav_usb_mt_close(struct input_dev *input) usb_autopm_put_interface(dwav_usb_mt->interface); } +/*-------------------------------------------------------------------------*/ static int dwav_usb_mt_suspend(struct usb_interface *intf, pm_message_t message) { struct dwav_usb_mt *dwav_usb_mt = usb_get_intfdata(intf); @@ -255,6 +314,7 @@ static int dwav_usb_mt_suspend(struct usb_interface *intf, pm_message_t message) return 0; } +/*-------------------------------------------------------------------------*/ static int dwav_usb_mt_resume(struct usb_interface *intf) { struct dwav_usb_mt *dwav_usb_mt = usb_get_intfdata(intf); @@ -269,6 +329,7 @@ static int dwav_usb_mt_resume(struct usb_interface *intf) return result; } +/*-------------------------------------------------------------------------*/ static int dwav_usb_mt_reset_resume(struct usb_interface *intf) { struct dwav_usb_mt *dwav_usb_mt = usb_get_intfdata(intf); @@ -284,6 +345,7 @@ static int dwav_usb_mt_reset_resume(struct usb_interface *intf) return err; } +/*-------------------------------------------------------------------------*/ static void dwav_usb_mt_free_buffers(struct usb_device *udev, struct dwav_usb_mt *dwav_usb_mt) { @@ -291,6 +353,7 @@ static void dwav_usb_mt_free_buffers(struct usb_device *udev, dwav_usb_mt->data, dwav_usb_mt->data_dma); } +/*-------------------------------------------------------------------------*/ static struct usb_endpoint_descriptor *dwav_usb_mt_get_input_endpoint( struct usb_host_interface *interface) { @@ -304,6 +367,7 @@ static struct usb_endpoint_descriptor *dwav_usb_mt_get_input_endpoint( return NULL; } +/*-------------------------------------------------------------------------*/ static int dwav_usb_mt_init(struct dwav_usb_mt *dwav_usb_mt, void *dev) { int err; @@ -323,17 +387,18 @@ static int dwav_usb_mt_init(struct dwav_usb_mt *dwav_usb_mt, void *dev) input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); - input_set_abs_params(input_dev, ABS_X, 0, DWAV_TOUCH_MAX_X, 0, 0); - input_set_abs_params(input_dev, ABS_Y, 0, DWAV_TOUCH_MAX_Y, 0, 0); + input_set_abs_params(input_dev, ABS_X, 0, + DEV_INFO[dwav_usb_mt->dev_id].max_x, 0, 0); + input_set_abs_params(input_dev, ABS_Y, 0, + DEV_INFO[dwav_usb_mt->dev_id].max_y, 0, 0); /* multi touch */ - input_set_abs_params( - input_dev, ABS_MT_POSITION_X, 0, - DWAV_TOUCH_MAX_X, 0, 0); - input_set_abs_params( - input_dev, ABS_MT_POSITION_Y, 0, - DWAV_TOUCH_MAX_Y, 0, 0); - input_mt_init_slots(input_dev, DWAV_TOUCH_MAX_ID, 0); + input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0, + DEV_INFO[dwav_usb_mt->dev_id].max_x, 0, 0); + input_set_abs_params(input_dev, ABS_MT_POSITION_Y, 0, + DEV_INFO[dwav_usb_mt->dev_id].max_y, 0, 0); + input_mt_init_slots(input_dev, + DEV_INFO[dwav_usb_mt->dev_id].max_finger, 0); err = input_register_device(input_dev); if (err) { @@ -347,6 +412,7 @@ static int dwav_usb_mt_init(struct dwav_usb_mt *dwav_usb_mt, void *dev) return 0; } +/*-------------------------------------------------------------------------*/ static int dwav_usb_mt_probe(struct usb_interface *intf, const struct usb_device_id *id) { @@ -365,9 +431,12 @@ static int dwav_usb_mt_probe(struct usb_interface *intf, if (!dwav_usb_mt) return -ENOMEM; - dwav_usb_mt->finger = - kzalloc(sizeof(struct finger_t) * DWAV_TOUCH_MAX_ID, - GFP_KERNEL); + dwav_usb_mt->dev_id = id->driver_info; + + dwav_usb_mt->finger = kzalloc(sizeof(struct finger_t) * + DEV_INFO[dwav_usb_mt->dev_id].max_finger, + GFP_KERNEL); + if (!dwav_usb_mt->finger) goto err_free_mem; @@ -440,6 +509,8 @@ static int dwav_usb_mt_probe(struct usb_interface *intf, usb_set_intfdata(intf, dwav_usb_mt); + dev_info(&intf->dev, "%s\n", DEV_INFO[dwav_usb_mt->dev_id].name); + return 0; err_free_urb: @@ -456,6 +527,7 @@ err_free_mem: return err; } +/*-------------------------------------------------------------------------*/ static void dwav_usb_mt_disconnect(struct usb_interface *intf) { struct dwav_usb_mt *dwav_usb_mt = usb_get_intfdata(intf); @@ -479,6 +551,7 @@ static void dwav_usb_mt_disconnect(struct usb_interface *intf) kfree(dwav_usb_mt); } +/*-------------------------------------------------------------------------*/ MODULE_DEVICE_TABLE(usb, dwav_usb_mt_devices); static struct usb_driver dwav_usb_mt_driver = { @@ -494,8 +567,10 @@ static struct usb_driver dwav_usb_mt_driver = { module_usb_driver(dwav_usb_mt_driver); +/*-------------------------------------------------------------------------*/ MODULE_AUTHOR("Hardkernel Co.,Ltd"); MODULE_DESCRIPTION("D-WAV USB(HID) MultiTouch Driver"); MODULE_LICENSE("GPL"); MODULE_ALIAS("dwav_usb_mt"); +/*-------------------------------------------------------------------------*/