Skip to content

Commit f715453

Browse files
authored
Merge pull request #321 from tobetter/odroidxu4-v4.14
Adding new USB touch screen module
2 parents e3d35ab + 53ccbcd commit f715453

File tree

4 files changed

+593
-0
lines changed

4 files changed

+593
-0
lines changed

arch/arm/configs/odroidxu4_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2306,6 +2306,7 @@ CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
23062306
# CONFIG_TOUCHSCREEN_ZET6223 is not set
23072307
# CONFIG_TOUCHSCREEN_ZFORCE is not set
23082308
# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
2309+
CONFIG_TOUCHSCREEN_DWAV_USB_MT=m
23092310
CONFIG_INPUT_MISC=y
23102311
# CONFIG_INPUT_AD714X is not set
23112312
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set

drivers/input/touchscreen/Kconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1246,4 +1246,17 @@ config TOUCHSCREEN_ROHM_BU21023
12461246
To compile this driver as a module, choose M here: the
12471247
module will be called bu21023_ts.
12481248

1249+
config TOUCHSCREEN_DWAV_USB_MT
1250+
tristate "D-WAV Scientific USB MultiTouch"
1251+
depends on USB_ARCH_HAS_HCD
1252+
select USB
1253+
help
1254+
Say Y here if you have a D-WAV Scientific USB(HID) based MultiTouch
1255+
controller.
1256+
1257+
If unsure, say N.
1258+
1259+
To compile this driver as a module, choose M here: the
1260+
module will be called dwav-usb-mt.
1261+
12491262
endif

drivers/input/touchscreen/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,3 +103,4 @@ obj-$(CONFIG_TOUCHSCREEN_ZET6223) += zet6223.o
103103
obj-$(CONFIG_TOUCHSCREEN_ZFORCE) += zforce_ts.o
104104
obj-$(CONFIG_TOUCHSCREEN_COLIBRI_VF50) += colibri-vf50-ts.o
105105
obj-$(CONFIG_TOUCHSCREEN_ROHM_BU21023) += rohm_bu21023.o
106+
obj-$(CONFIG_TOUCHSCREEN_DWAV_USB_MT) += dwav-usb-mt.o

0 commit comments

Comments
 (0)