From f5570d9c56327f5e1b2c217c65882d7c1e5acab6 Mon Sep 17 00:00:00 2001 From: Ian Hope Date: Sun, 5 May 2024 09:24:02 +1000 Subject: [PATCH 1/6] rp22 defconfig changes Change-Id: If1aaec2fc8fa7ea35423c4c8c3fd0b5869be95e4 --- arch/arm/configs/lineage_gts210ltexx_defconfig | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm/configs/lineage_gts210ltexx_defconfig b/arch/arm/configs/lineage_gts210ltexx_defconfig index 8d929055344..cb6d80de264 100644 --- a/arch/arm/configs/lineage_gts210ltexx_defconfig +++ b/arch/arm/configs/lineage_gts210ltexx_defconfig @@ -2763,7 +2763,7 @@ CONFIG_ION=y CONFIG_ION_EXYNOS=y CONFIG_ION_EXYNOS_STAT_LOG=y CONFIG_ION_EXYNOS_OF=y -CONFIG_DDK_VERSION_OS="n" +CONFIG_DDK_VERSION_OS="o" # # ARM GPU Configuration @@ -2796,7 +2796,7 @@ CONFIG_MALI_SEC_LEGACY_SUPPORT=y CONFIG_MALI_MIDGARD=y # CONFIG_MALI_MIDGARD_DVFS is not set # CONFIG_MALI_CORESTACK is not set -# CONFIG_MALI_FENCE_DEBUG is not set +CONFIG_MALI_FENCE_DEBUG=y # CONFIG_MALI_GPU_MMU_AARCH64 is not set CONFIG_EXYNOS_SOC_NAME="5433" CONFIG_MALI_SEC_CL_BOOST=y @@ -2804,7 +2804,11 @@ CONFIG_MALI_SEC_UTILIZATION=y CONFIG_MALI_PM_QOS=y # CONFIG_MALI_BTS_OPTIMIZATION is not set CONFIG_MALI_DEBUG_KERNEL_SYSFS=y -# CONFIG_MALI_EXYNOS_SECURE_RENDERING is not set +CONFIG_MALI_EXYNOS_SECURE_RENDERING=y +# CONFIG_MALI_JOB_DUMPING is not set +# CONFIG_MALI_2MB_ALLOC is not set +# CONFIG_MALI_PWRSOFT_765 is not set +CONFIG_MALI_SEC_JOB_STATUS_CHECK=y # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=y From 77ce405b26196c920e13872192b3a8ac0f43a03f Mon Sep 17 00:00:00 2001 From: Ian Hope Date: Sun, 5 May 2024 09:35:08 +1000 Subject: [PATCH 2/6] Enable hall sensor. Change-Id: I8b9eb9603597cfdbd6fe798c208d499ec5186b94 --- arch/arm/configs/lineage_gts210ltexx_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/configs/lineage_gts210ltexx_defconfig b/arch/arm/configs/lineage_gts210ltexx_defconfig index cb6d80de264..a41ca65b190 100644 --- a/arch/arm/configs/lineage_gts210ltexx_defconfig +++ b/arch/arm/configs/lineage_gts210ltexx_defconfig @@ -1817,7 +1817,7 @@ CONFIG_INPUT_EVDEV=y CONFIG_HALL=y # CONFIG_CERTIFY_HALL is not set CONFIG_HALL_ACCESSORY=y -# CONFIG_SENSORS_HALL_IRQ_CTRL is not set +CONFIG_SENSORS_HALL_IRQ_CTRL=y # CONFIG_INPUT_EXPANDED_ABS is not set # From 44700e48c9617e34a8df613bf4709087f5b9ef84 Mon Sep 17 00:00:00 2001 From: Ian Hope Date: Sun, 5 May 2024 09:40:29 +1000 Subject: [PATCH 3/6] remove condition SEC_BUILD_CONF_USE_FINGERPRINT_TZ Change-Id: I2683b37bac4738134dfbbb768568adfc8d4020c0 --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index 99d4d4bbaf9..7155b4001d2 100644 --- a/Makefile +++ b/Makefile @@ -711,11 +711,9 @@ KBUILD_CFLAGS += $(KCFLAGS) ifeq ($(CONFIG_SENSORS_FINGERPRINT), y) ifneq ($(CONFIG_SEC_FACTORY), true) -ifneq ($(SEC_BUILD_CONF_USE_FINGERPRINT_TZ), false) export KBUILD_FP_SENSOR_CFLAGS := -DENABLE_SENSORS_FPRINT_SECURE endif endif -endif # Use --build-id when available. LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\ From 5c17f1ca70c0e511abe189503aec1f947b89e2a5 Mon Sep 17 00:00:00 2001 From: Ian Hope Date: Sun, 5 May 2024 09:48:17 +1000 Subject: [PATCH 4/6] remove wakelock Change-Id: I5d0018f37c83cfea58c42123038815b768dfef15 --- drivers/fingerprint/vfs7xxx.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/fingerprint/vfs7xxx.c b/drivers/fingerprint/vfs7xxx.c index 4da19232dbe..5ac223b1177 100644 --- a/drivers/fingerprint/vfs7xxx.c +++ b/drivers/fingerprint/vfs7xxx.c @@ -61,7 +61,6 @@ #include #ifdef ENABLE_SENSORS_FPRINT_SECURE -#include #include #include #include @@ -164,7 +163,7 @@ struct vfsspi_device_data { #ifdef ENABLE_SENSORS_FPRINT_SECURE bool enabled_clk; #ifdef FEATURE_SPI_WAKELOCK - struct wake_lock fp_spi_lock; + struct wakeup_source fp_spi_lock; #endif #endif int sensortype; @@ -612,7 +611,7 @@ static int vfsspi_set_clk(struct vfsspi_device_data *vfsspi_device, __func__); kfree(spi_info); #ifdef FEATURE_SPI_WAKELOCK - wake_lock(&vfsspi_device->fp_spi_lock); + __pm_stay_awake(&vfsspi_device->fp_spi_lock); #endif vfsspi_device->enabled_clk = true; } else @@ -648,7 +647,7 @@ static int vfsspi_ioctl_disable_spi_clock( spi_dev_put(spidev); #ifdef FEATURE_SPI_WAKELOCK - wake_unlock(&vfsspi_device->fp_spi_lock); + __pm_relax(&vfsspi_device->fp_spi_lock); #endif vfsspi_device->enabled_clk = false; } @@ -1183,8 +1182,8 @@ static int vfsspi_platformInit(struct vfsspi_device_data *vfsspi_device) #ifdef ENABLE_SENSORS_FPRINT_SECURE #ifdef FEATURE_SPI_WAKELOCK - wake_lock_init(&vfsspi_device->fp_spi_lock, - WAKE_LOCK_SUSPEND, "vfsspi_wake_lock"); + wakeup_source_init(&vfsspi_device->fp_spi_lock, "vfsspi_wakeup_lock"); + pr_info("wakeup_source_init - vfsspi_wake_lock \n"); #endif #endif @@ -1230,7 +1229,7 @@ static void vfsspi_platformUninit(struct vfsspi_device_data *vfsspi_device) gpio_free(vfsspi_device->ocp_en); #ifdef ENABLE_SENSORS_FPRINT_SECURE #ifdef FEATURE_SPI_WAKELOCK - wake_lock_destroy(&vfsspi_device->fp_spi_lock); + wakeup_source_trash(&vfsspi_device->fp_spi_lock); #endif #endif } @@ -1924,4 +1923,4 @@ module_init(vfsspi_init); module_exit(vfsspi_exit); MODULE_DESCRIPTION("Validity FPS sensor"); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL"); \ No newline at end of file From 82c1785e35358f2d525d96947d2375322f9360bc Mon Sep 17 00:00:00 2001 From: Ian Hope Date: Sun, 5 May 2024 09:50:03 +1000 Subject: [PATCH 5/6] remove unused variable- second Change-Id: I940dc9abfd70e2eea62d5341b008a35d82175aaf --- drivers/input/hall_accessory.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/input/hall_accessory.c b/drivers/input/hall_accessory.c index 6883d756295..18ede25a97f 100644 --- a/drivers/input/hall_accessory.c +++ b/drivers/input/hall_accessory.c @@ -86,9 +86,6 @@ static void accessory_detect_work(struct work_struct *work) static void accessory_detect_work(struct work_struct *work) { bool first; -#ifdef CONFIG_SENSORS_HALL_IRQ_CTRL - bool second; -#endif struct hall_drvdata *ddata = container_of(work, struct hall_drvdata, accessory_dwork.work); From 4777f44f3ab3d2af4f722648c777945852fbf7af Mon Sep 17 00:00:00 2001 From: Ian Hope Date: Fri, 10 May 2024 09:34:23 +1000 Subject: [PATCH 6/6] mali r22p0 changes Change-Id: I937e44291fb533eca6bdd4bd2b66dd600597f91d --- arch/arm/configs/lineage_gts210ltexx_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/lineage_gts210ltexx_defconfig b/arch/arm/configs/lineage_gts210ltexx_defconfig index a41ca65b190..04ec705c177 100644 --- a/arch/arm/configs/lineage_gts210ltexx_defconfig +++ b/arch/arm/configs/lineage_gts210ltexx_defconfig @@ -2763,6 +2763,7 @@ CONFIG_ION=y CONFIG_ION_EXYNOS=y CONFIG_ION_EXYNOS_STAT_LOG=y CONFIG_ION_EXYNOS_OF=y +# use "n" for mali r15 CONFIG_DDK_VERSION_OS="n" CONFIG_DDK_VERSION_OS="o" # @@ -2772,6 +2773,7 @@ CONFIG_MALI_T7XX=y # CONFIG_MALI_R5P0 is not set # CONFIG_MALI_R7P0 is not set # CONFIG_MALI_R12P0 is not set +# CONFIG_MALI_R15P0 is not set CONFIG_MALI_R22P0=y # CONFIG_MALI_GATOR_SUPPORT is not set CONFIG_MALI_DVFS=y