diff options
| -rw-r--r-- | BUILD.bazel | 24 | ||||
| -rw-r--r-- | Kbuild | 7 | ||||
| -rw-r--r-- | Makefile | 23 | ||||
| -rw-r--r-- | sec_ts.c | 3 | ||||
| -rw-r--r-- | sec_ts.h | 2 |
5 files changed, 34 insertions, 25 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index 37eb754..69ac994 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -6,26 +6,38 @@ # unless you have coordinated with the team managing the Soong to Bazel # migration. -load("//build/kleaf:kernel.bzl", "kernel_module") +load("//build/kernel/kleaf:kernel.bzl", "kernel_module") + +filegroup( + name = "sec.kconfig", + srcs = glob([ + "Kconfig", + ]), + visibility = [ + "//private/google-modules/soc/gs:__pkg__", + ], +) kernel_module( - name = "sec.cloudripper", + name = "sec.slider", srcs = glob([ "**/*.c", "**/*.h", "Kbuild", ]) + [ "//private/google-modules/touch/common:headers", - "//private/google-modules/display/samsung:headers", + "//private/google-modules/display:headers", + "//private/google-modules/display/include:headers", + "//private/google-modules/soc/gs:gs101_soc_headers", ], outs = [ "sec_touch.ko", ], - kernel_build = "//private/gs-google:cloudripper", + kernel_build = "//private/google-modules/soc/gs:slider", kernel_module_deps = [ - "//private/google-modules/touch/common:common.cloudripper", + "//private/google-modules/touch/common:common.slider", ], visibility = [ - "//private/gs-google:__pkg__", + "//private/google-modules/soc/gs:__pkg__", ], ) @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0 + +ccflags-y += -I$(srctree)/../private/google-modules/display +ccflags-y += -I$(srctree)/../private/google-modules/display/include/uapi +ccflags-y += -I$(srctree)/../private/google-modules/touch/common +ccflags-y += -I$(srctree)/../private/google-modules/touch/common/include + obj-$(CONFIG_TOUCHSCREEN_SEC_TS) += sec_touch.o sec_touch-objs += sec_ts.o sec_ts_fw.o sec_ts_fn.o sec_cmd.o \ sec_ts_only_vendor.o @@ -1,22 +1,11 @@ -ifeq ($(CONFIG_SAMSUNG_PRODUCT_SHIP), y) - obj-$(CONFIG_TOUCHSCREEN_SEC_TS) += sec_ts.o sec_ts_fw.o sec_ts_fn.o sec_cmd.o -else - obj-$(CONFIG_TOUCHSCREEN_SEC_TS) += sec_ts.o sec_ts_fw.o sec_ts_fn.o sec_cmd.o sec_ts_only_vendor.o -endif +# SPDX-License-Identifier: GPL-2.0 + +KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build +M ?= $(shell pwd) -KBUILD_OPTIONS += CONFIG_TOUCHSCREEN_SEC_TS=m EXTRA_CFLAGS += -DDYNAMIC_DEBUG_MODULE -EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_TBN -EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HEATMAP -EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_OFFLOAD -EXTRA_CFLAGS += -I$(KERNEL_SRC)/../google-modules/display -EXTRA_CFLAGS += -I$(KERNEL_SRC)/../google-modules/touch/common -EXTRA_CFLAGS += -I$(KERNEL_SRC)/../google-modules/touch/common/include -EXTRA_SYMBOLS += $(OUT_DIR)/../google-modules/touch/common/Module.symvers +EXTRA_SYMBOLS += $(OUT_DIR)/../private/google-modules/touch/common/Module.symvers modules modules_install clean: $(MAKE) -C $(KERNEL_SRC) M=$(M) \ - $(KBUILD_OPTIONS) \ - EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ - KBUILD_EXTRA_SYMBOLS="$(EXTRA_SYMBOLS)" \ - $(@) + EXTRA_CFLAGS="$(EXTRA_CFLAGS)" KBUILD_EXTRA_SYMBOLS="$(EXTRA_SYMBOLS)" $(@) @@ -1925,11 +1925,12 @@ inline void sec_ts_kfifo_push_coord(struct sec_ts_data *ts, u8 slot) inline void sec_ts_kfifo_pop_all_coords(struct sec_ts_data *ts) { + int __maybe_unused len; /* * Keep coords without pop-out to support different timing * print-out by each caller. */ - kfifo_out_peek(&debug_fifo, last_coord, kfifo_size(&debug_fifo)); + len = kfifo_out_peek(&debug_fifo, last_coord, kfifo_size(&debug_fifo)); } inline void sec_ts_debug_dump(struct sec_ts_data *ts) @@ -605,7 +605,7 @@ enum { #define SEC_TS_IO_RESET_CNT 3 #define SEC_TS_IO_RETRY_CNT 3 -#define SEC_TS_WAIT_RETRY_CNT 100 +#define SEC_TS_WAIT_RETRY_CNT 10 #define SEC_TS_MODE_CUSTOMLIB_SPAY (1 << 1) #define SEC_TS_MODE_CUSTOMLIB_AOD (1 << 2) |