diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2022-11-17 11:04:03 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2022-11-17 11:04:03 -0800 |
| commit | 0574f3adf0df7f2cbdfa155457cb27435bf0ccd2 (patch) | |
| tree | 6086cfb50386d7075e68d0fc0ceab5957f8f1d54 | |
| parent | 66c23a73b262177c6bf31245710c72235fd1777d (diff) | |
| parent | 6ef3bf8526d3ae507fbb229e8cef538e1dd02193 (diff) | |
| download | touch-0574f3adf0df7f2cbdfa155457cb27435bf0ccd2.tar.gz | |
Merge "touch: pineapple: enable touch drivers for pineapple" into touch-kernel.lnx.5.15.r6-rel
| -rw-r--r-- | Kbuild | 5 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | config/gki_pineappletouch.conf | 5 | ||||
| -rw-r--r-- | config/gki_pineappletouchconf.h | 8 |
4 files changed, 22 insertions, 0 deletions
@@ -16,6 +16,11 @@ endif LINUX_INC += -include $(TOUCH_ROOT)/config/gki_khajetouchconf.h #endif +#ifeq ($(CONFIG_ARCH_PINEAPPLE), y) + include $(TOUCH_ROOT)/config/gki_pineappletouch.conf + LINUX_INC += -include $(TOUCH_ROOT)/config/gki_pineappletouchconf.h +#endif + LINUX_INC += -Iinclude/linux \ -Iinclude/linux/drm \ -Iinclude/linux/gunyah \ diff --git a/Makefile.am b/Makefile.am index 106a9a8..1720874 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,10 @@ ifeq ($(TARGET_SUPPORT),genericarmv8) KBUILD_OPTIONS += CONFIG_ARCH_WAIPIO=y endif +ifeq ($(TARGET_SUPPORT),genericarmv8) + KBUILD_OPTIONS += CONFIG_ARCH_PINEAPPLE=y +endif + all: $(MAKE) -C $(KERNEL_SRC) M=$(M) modules $(KBUILD_OPTIONS) diff --git a/config/gki_pineappletouch.conf b/config/gki_pineappletouch.conf new file mode 100644 index 0000000..0849bec --- /dev/null +++ b/config/gki_pineappletouch.conf @@ -0,0 +1,5 @@ +export CONFIG_TOUCHSCREEN_NT36XXX_I2C=y +export CONFIG_TOUCHSCREEN_GOODIX_BRL=y +export CONFIG_TOUCHSCREEN_ATMEL_MXT=y +export CONFIG_TOUCHSCREEN_DUMMY=y +export CONFIG_MSM_TOUCH=m diff --git a/config/gki_pineappletouchconf.h b/config/gki_pineappletouchconf.h new file mode 100644 index 0000000..934e717 --- /dev/null +++ b/config/gki_pineappletouchconf.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#define CONFIG_TOUCHSCREEN_NT36XXX_I2C 1 +#define CONFIG_TOUCHSCREEN_GOODIX_BRL 1 +#define CONFIG_TOUCHSCREEN_ATMEL_MXT 1 |