From 03c20eb25202d9b5ecc620990d593e1d2f0a09aa Mon Sep 17 00:00:00 2001 From: Yuchang Guo Date: Tue, 5 Sep 2023 14:35:20 +0800 Subject: [PATCH] awinic: setup build on kernel 5.15 awinic: Setup build on kernel 5.15. Change-Id: Ic093cc58324986b326294564dc1302a4181e373c Reviewed-on: https://gerrit.mot.com/2730469 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Submit-Approved: Jira Key Tested-by: Jira Key Reviewed-by: (cherry picked from commit 54ba4eb801f1d938b07e4982dddc60c03c6e9433) Reviewed-on: https://gerrit.mot.com/2741051 Reviewed-by: Yuchang Guo Reviewed-by: Xiangpo Zhao Reviewed-by: Lijun Chen --- drivers/misc/awinic/sarsensor/Android.mk | 1 + drivers/misc/awinic/sarsensor/Makefile | 14 ++++++++++++++ drivers/misc/awinic/sarsensor/aw963xx/aw963xx.c | 3 +-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/misc/awinic/sarsensor/Android.mk b/drivers/misc/awinic/sarsensor/Android.mk index 4ba116078b65..c9500f25e070 100644 --- a/drivers/misc/awinic/sarsensor/Android.mk +++ b/drivers/misc/awinic/sarsensor/Android.mk @@ -12,5 +12,6 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/sensors_class.ko #LOCAL_REQUIRED_MODULES := sensors_class.ko KBUILD_OPTIONS_GKI += GKI_OBJ_MODULE_DIR=gki +KBUILD_OPTIONS += MODULE_KERNEL_VERSION=$(TARGET_KERNEL_VERSION) include $(DLKM_DIR)/AndroidKernelModule.mk diff --git a/drivers/misc/awinic/sarsensor/Makefile b/drivers/misc/awinic/sarsensor/Makefile index 62a13fd28500..ebf65dd9e5b8 100644 --- a/drivers/misc/awinic/sarsensor/Makefile +++ b/drivers/misc/awinic/sarsensor/Makefile @@ -1,3 +1,16 @@ +ifeq ($(strip $(MODULE_KERNEL_VERSION)), 5.15) +all: modules +modules: + $(MAKE) -C $(KERNEL_SRC) M=$(M) modules $(KBUILD_OPTIONS) +modules_install: + $(MAKE) INSTALL_MOD_STRIP=1 -C $(KERNEL_SRC) M=$(M) modules_install +%: + $(MAKE) -C $(KERNEL_SRC) M=$(M) $@ $(KBUILD_OPTIONS) +clean: + rm -f *.o *.ko *.mod.c *.mod.o *~ .*.cmd Module.symvers + rm -rf .tmp_versions +KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../sensors/$(GKI_OBJ_MODULE_DIR)/Module.symvers +else KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build all: @@ -9,3 +22,4 @@ modules_install: clean: $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean +endif diff --git a/drivers/misc/awinic/sarsensor/aw963xx/aw963xx.c b/drivers/misc/awinic/sarsensor/aw963xx/aw963xx.c index b0299bee930a..5bedd21128f9 100644 --- a/drivers/misc/awinic/sarsensor/aw963xx/aw963xx.c +++ b/drivers/misc/awinic/sarsensor/aw963xx/aw963xx.c @@ -310,7 +310,6 @@ static void aw963xx_irq_handle_func(uint32_t irq_status, void *data) { int8_t i = 0; int8_t j = 0; - int32_t ret = 0; uint32_t curr_status_val[4] = { 0 }; struct aw_sar *p_sar = (struct aw_sar *)data; @@ -318,7 +317,7 @@ static void aw963xx_irq_handle_func(uint32_t irq_status, void *data) AWLOGD(p_sar->dev, "IRQSRC = 0x%x", irq_status); for (i = 0; i < AW963XX_VALID_TH; i++) - ret = aw_sar_i2c_read(p_sar->i2c, REG_STAT0 + i * (REG_STAT1 - REG_STAT0), &curr_status_val[i]); + aw_sar_i2c_read(p_sar->i2c, REG_STAT0 + i * (REG_STAT1 - REG_STAT0), &curr_status_val[i]); for (j = 0; j < AW963XX_CHANNEL_NUM_MAX; j++) { if (p_sar->channels_arr[j].input == NULL) {