From 60f3b13f2749e82d6eebed52db9e137277f94990 Mon Sep 17 00:00:00 2001 From: Arian Date: Sat, 27 Jan 2024 11:09:46 +0100 Subject: [PATCH] sm8450-common: Decommonize regulator, touch, haptics and audio kernel modules Change-Id: I644b35134d3beca8c31d218bfcbff2f4ad4ac2fd --- BoardConfigCommon.mk | 8 ++++---- modules.list.second_stage | 3 --- modules.list.vendor_dlkm | 1 - 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 5d9ed71..2824c77 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -115,11 +115,11 @@ first_stage_modules := $(strip $(shell cat $(TARGET_KERNEL_SOURCE)/modules.list. second_stage_modules := $(strip $(shell cat $(COMMON_PATH)/modules.list.second_stage)) vendor_dlkm_exclusive_modules := $(strip $(shell cat $(COMMON_PATH)/modules.list.vendor_dlkm)) -BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(first_stage_modules) -BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD := $(first_stage_modules) $(second_stage_modules) -BOARD_VENDOR_KERNEL_MODULES_LOAD := $(second_stage_modules) $(vendor_dlkm_exclusive_modules) +BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD += $(first_stage_modules) +BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD += $(first_stage_modules) $(second_stage_modules) +BOARD_VENDOR_KERNEL_MODULES_LOAD += $(second_stage_modules) $(vendor_dlkm_exclusive_modules) -BOOT_KERNEL_MODULES := $(first_stage_modules) $(second_stage_modules) +BOOT_KERNEL_MODULES += $(first_stage_modules) $(second_stage_modules) BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(TARGET_KERNEL_SOURCE)/modules.vendor_blocklist.msm.waipio BOARD_VENDOR_RAMDISK_KERNEL_MODULES_BLOCKLIST_FILE := $(BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE) diff --git a/modules.list.second_stage b/modules.list.second_stage index 950c3f3..70efce3 100644 --- a/modules.list.second_stage +++ b/modules.list.second_stage @@ -82,7 +82,6 @@ panel_event_notifier.ko qcom_sync_file.ko hung_task_enh.ko qfprom-sys.ko -qcom_pm8008-regulator.ko qpnp-amoled-regulator.ko hvc_gunyah.ko msm_rng.ko @@ -129,13 +128,11 @@ nb7vpq904m.ko atmel_mxt_ts.ko focaltech_fts.ko synaptics_dsx.ko -fts_touch_spi.ko xiaomi_touch.ko nt36xxx-i2c.ko nt36xxx-spi.ko goodix_core.ko pm8941-pwrkey.ko -aw8697-haptic.ko goodix_fod.ko i2c-msm-geni.ko i3c-master-msm-geni.ko diff --git a/modules.list.vendor_dlkm b/modules.list.vendor_dlkm index 4580692..6837ead 100644 --- a/modules.list.vendor_dlkm +++ b/modules.list.vendor_dlkm @@ -27,7 +27,6 @@ lpass_cdc_dlkm.ko wsa883x_dlkm.ko wcd938x_dlkm.ko wcd938x_slave_dlkm.ko -cs35l41_dlkm.ko aw882xx_dlkm.ko wcd937x_dlkm.ko wcd937x_slave_dlkm.ko