From 372beca218c46d52329684f516a6474b1c6249f9 Mon Sep 17 00:00:00 2001 From: Prasad Kumpatla Date: Tue, 9 Jan 2024 21:48:09 +0530 Subject: [PATCH] asoc: codec: remove unwanted modules for pitti remove unwanted modules for pitti. Change-Id: I29def6096841d0d9dfcccd81ec9761b7ef6ff1be Signed-off-by: Prasad Kumpatla --- Android.mk | 2 +- EnableBazel.mk | 9 +-------- asoc/codecs/wcd937x/Kbuild | 4 ---- asoc/codecs/wcd938x/Kbuild | 4 ---- asoc/codecs/wcd939x/Kbuild | 4 ---- asoc/codecs/wsa883x/Kbuild | 4 ---- asoc/codecs/wsa884x/Kbuild | 4 ---- audio_kernel_modules.mk | 12 +++++++----- audio_kernel_product_board.mk | 8 +++++--- build/pitti.bzl | 1 - 10 files changed, 14 insertions(+), 38 deletions(-) diff --git a/Android.mk b/Android.mk index 2458c03122..719916fe46 100644 --- a/Android.mk +++ b/Android.mk @@ -234,7 +234,7 @@ LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/Build_external_kernelmodule.mk ########################################################### -ifneq ($(call is-board-platform-in-list, bengal holi blair),true) +ifneq ($(call is-board-platform-in-list, bengal holi blair pitti),true) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(AUDIO_SRC_FILES) LOCAL_MODULE := swr_dmic_dlkm.ko diff --git a/EnableBazel.mk b/EnableBazel.mk index f5ad3ee0b5..e0ccfa3448 100644 --- a/EnableBazel.mk +++ b/EnableBazel.mk @@ -56,7 +56,6 @@ LOCAL_MODULE_KO_DIRS += soc/swr_ctrl_dlkm.ko LOCAL_MODULE_KO_DIRS += soc/snd_event_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd_core_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/mbhc_dlkm.ko -LOCAL_MODULE_KO_DIRS += asoc/codecs/swr_dmic_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd9xxx_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/swr_haptics_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/stub_dlkm.ko @@ -67,13 +66,7 @@ LOCAL_MODULE_KO_DIRS += asoc/codecs/lpass-cdc/lpass_cdc_wsa2_macro_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/lpass-cdc/lpass_cdc_va_macro_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/lpass-cdc/lpass_cdc_tx_macro_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/lpass-cdc/lpass_cdc_rx_macro_dlkm.ko -LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd937x/wcd937x_dlkm.ko -LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd937x/wcd937x_slave_dlkm.ko -LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd938x/wcd938x_dlkm.ko -LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd938x/wcd938x_slave_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/wsa881x_analog_dlkm.ko -LOCAL_MODULE_KO_DIRS += asoc/codecs/wsa883x/wsa883x_dlkm.ko -LOCAL_MODULE_KO_DIRS += asoc/codecs/wsa884x/wsa884x_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd9378/wcd9378_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd9378/wcd9378_slave_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/hdmi_dlkm.ko @@ -184,4 +177,4 @@ LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd9378/wcd9378_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd9378/wcd9378_slave_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/wsa881x_analog_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/hdmi_dlkm.ko -endif \ No newline at end of file +endif diff --git a/asoc/codecs/wcd937x/Kbuild b/asoc/codecs/wcd937x/Kbuild index 78889c18bb..e0a8d9baf4 100644 --- a/asoc/codecs/wcd937x/Kbuild +++ b/asoc/codecs/wcd937x/Kbuild @@ -52,10 +52,6 @@ ifeq ($(KERNEL_BUILD), 0) include $(AUDIO_ROOT)/config/pineappleauto.conf INCS += -include $(AUDIO_ROOT)/config/pineappleautoconf.h endif - ifeq ($(CONFIG_ARCH_PITTI), y) - include $(AUDIO_ROOT)/config/pineappleauto.conf - INCS += -include $(AUDIO_ROOT)/config/pineappleautoconf.h - endif endif # As per target team, build is done as follows: diff --git a/asoc/codecs/wcd938x/Kbuild b/asoc/codecs/wcd938x/Kbuild index 964ccc1b87..2899d0b269 100644 --- a/asoc/codecs/wcd938x/Kbuild +++ b/asoc/codecs/wcd938x/Kbuild @@ -35,10 +35,6 @@ ifeq ($(KERNEL_BUILD), 0) include $(AUDIO_ROOT)/config/pineappleauto.conf INCS += -include $(AUDIO_ROOT)/config/pineappleautoconf.h endif - ifeq ($(CONFIG_ARCH_PITTI), y) - include $(AUDIO_ROOT)/config/pineappleauto.conf - INCS += -include $(AUDIO_ROOT)/config/pineappleautoconf.h - endif ifeq ($(CONFIG_ARCH_HOLI), y) include $(AUDIO_ROOT)/config/holiauto.conf INCS += -include $(AUDIO_ROOT)/config/holiautoconf.h diff --git a/asoc/codecs/wcd939x/Kbuild b/asoc/codecs/wcd939x/Kbuild index e81f5ac8b4..422c343e2b 100644 --- a/asoc/codecs/wcd939x/Kbuild +++ b/asoc/codecs/wcd939x/Kbuild @@ -35,10 +35,6 @@ ifeq ($(KERNEL_BUILD), 0) include $(AUDIO_ROOT)/config/pineappleauto.conf INCS += -include $(AUDIO_ROOT)/config/pineappleautoconf.h endif - ifeq ($(CONFIG_ARCH_PITTI), y) - include $(AUDIO_ROOT)/config/pineappleauto.conf - INCS += -include $(AUDIO_ROOT)/config/pineappleautoconf.h - endif endif diff --git a/asoc/codecs/wsa883x/Kbuild b/asoc/codecs/wsa883x/Kbuild index 8eb00e7d5e..4b26118133 100644 --- a/asoc/codecs/wsa883x/Kbuild +++ b/asoc/codecs/wsa883x/Kbuild @@ -34,10 +34,6 @@ ifeq ($(KERNEL_BUILD), 0) include $(AUDIO_ROOT)/config/pineappleauto.conf INCS += -include $(AUDIO_ROOT)/config/pineappleautoconf.h endif - ifeq ($(CONFIG_ARCH_PITTI), y) - include $(AUDIO_ROOT)/config/pineappleauto.conf - INCS += -include $(AUDIO_ROOT)/config/pineappleautoconf.h - endif endif # As per target team, build is done as follows: diff --git a/asoc/codecs/wsa884x/Kbuild b/asoc/codecs/wsa884x/Kbuild index 051056bda8..b556cd08f0 100644 --- a/asoc/codecs/wsa884x/Kbuild +++ b/asoc/codecs/wsa884x/Kbuild @@ -30,10 +30,6 @@ ifeq ($(KERNEL_BUILD), 0) include $(AUDIO_ROOT)/config/pineappleauto.conf INCS += -include $(AUDIO_ROOT)/config/pineappleautoconf.h endif - ifeq ($(CONFIG_ARCH_PITTI), y) - include $(AUDIO_ROOT)/config/pineappleauto.conf - INCS += -include $(AUDIO_ROOT)/config/pineappleautoconf.h - endif ifeq ($(CONFIG_ARCH_LITO), y) include $(AUDIO_ROOT)/config/litoauto.conf INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h diff --git a/audio_kernel_modules.mk b/audio_kernel_modules.mk index b51222ca26..144887d3ed 100644 --- a/audio_kernel_modules.mk +++ b/audio_kernel_modules.mk @@ -31,21 +31,23 @@ AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/q6_notifier_dlkm.ko\ $(KERNEL_MODULES_OUT)/stub_dlkm.ko \ $(KERNEL_MODULES_OUT)/machine_dlkm.ko ifneq ($(call is-board-platform-in-list,bengal holi blair), true) -AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/swr_dmic_dlkm.ko \ - $(KERNEL_MODULES_OUT)/swr_haptics_dlkm.ko \ +AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/swr_haptics_dlkm.ko \ $(KERNEL_MODULES_OUT)/hdmi_dlkm.ko \ $(KERNEL_MODULES_OUT)/lpass_cdc_wsa2_macro_dlkm.ko \ $(KERNEL_MODULES_OUT)/lpass_cdc_wsa_macro_dlkm.ko \ $(KERNEL_MODULES_OUT)/lpass_cdc_va_macro_dlkm.ko \ $(KERNEL_MODULES_OUT)/lpass_cdc_rx_macro_dlkm.ko \ $(KERNEL_MODULES_OUT)/lpass_cdc_tx_macro_dlkm.ko \ - $(KERNEL_MODULES_OUT)/lpass_cdc_dlkm.ko \ - $(KERNEL_MODULES_OUT)/wsa884x_dlkm.ko \ + $(KERNEL_MODULES_OUT)/lpass_cdc_dlkm.ko +ifneq ($(call is-board-platform-in-list,bengal holi blair pitti), true) +AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/wsa884x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wsa883x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd937x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd937x_slave_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd938x_dlkm.ko \ - $(KERNEL_MODULES_OUT)/wcd938x_slave_dlkm.ko + $(KERNEL_MODULES_OUT)/wcd938x_slave_dlkm.ko \ + $(KERNEL_MODULES_OUT)/swr_dmic_dlkm.ko +endif ifneq ($(call is-board-platform-in-list,niobe pitti), true) AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/wcd939x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd939x_slave_dlkm.ko diff --git a/audio_kernel_product_board.mk b/audio_kernel_product_board.mk index 4b6be620d1..8b43b61072 100644 --- a/audio_kernel_product_board.mk +++ b/audio_kernel_product_board.mk @@ -18,21 +18,23 @@ PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/q6_notifier_dlkm.ko\ $(KERNEL_MODULES_OUT)/stub_dlkm.ko \ $(KERNEL_MODULES_OUT)/machine_dlkm.ko ifneq ($(call is-board-platform-in-list,bengal holi blair), true) -PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/swr_dmic_dlkm.ko \ - $(KERNEL_MODULES_OUT)/swr_haptics_dlkm.ko \ +PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/swr_haptics_dlkm.ko \ $(KERNEL_MODULES_OUT)/hdmi_dlkm.ko \ $(KERNEL_MODULES_OUT)/lpass_cdc_wsa2_macro_dlkm.ko \ $(KERNEL_MODULES_OUT)/lpass_cdc_wsa_macro_dlkm.ko \ $(KERNEL_MODULES_OUT)/lpass_cdc_va_macro_dlkm.ko \ $(KERNEL_MODULES_OUT)/lpass_cdc_rx_macro_dlkm.ko \ $(KERNEL_MODULES_OUT)/lpass_cdc_tx_macro_dlkm.ko \ - $(KERNEL_MODULES_OUT)/lpass_cdc_dlkm.ko \ + $(KERNEL_MODULES_OUT)/lpass_cdc_dlkm.ko +ifneq ($(call is-board-platform-in-list,bengal holi blair pitti), true) +PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/swr_dmic_dlkm.ko \ $(KERNEL_MODULES_OUT)/wsa884x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wsa883x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd937x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd937x_slave_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd938x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd938x_slave_dlkm.ko +endif ifneq ($(call is-board-platform-in-list,niobe pitti), true) PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/wcd939x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd939x_slave_dlkm.ko diff --git a/build/pitti.bzl b/build/pitti.bzl index 47d87a4297..218b641023 100644 --- a/build/pitti.bzl +++ b/build/pitti.bzl @@ -23,7 +23,6 @@ def define_pitti(): "machine_dlkm", "wcd_core_dlkm", "mbhc_dlkm", - "swr_dmic_dlkm", "wcd9xxx_dlkm", "swr_haptics_dlkm", "stub_dlkm",