asoc: Fix vendor compilation issue on kalpeni

Fix vendor compilation issue on kalpeni.

Change-Id: Ief6349bed2055586858d800704136a421232bdb3
Signed-off-by: Sarath Varma Ganapathiraju <[email protected]>

Android.mk

@@ -258,7 +258,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 pitti),true)
+ifneq ($(call is-board-platform-in-list, bengal holi blair),true)
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES           := $(AUDIO_SRC_FILES)
 LOCAL_MODULE              := swr_haptics_dlkm.ko
@@ -287,7 +287,7 @@ LOCAL_MODULE_DEBUG_ENABLE := true
 LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
 include $(DLKM_DIR)/Build_external_kernelmodule.mk
 ########################### LPASS-CDC CODEC  ###########################
-ifneq ($(call is-board-platform-in-list, bengal holi blair pitti),true)
+ifneq ($(call is-board-platform-in-list, bengal holi blair),true)
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES           := $(AUDIO_SRC_FILES)
 LOCAL_MODULE              := lpass_cdc_dlkm.ko
@@ -467,42 +467,6 @@ LOCAL_MODULE_TAGS         := optional
 LOCAL_MODULE_DEBUG_ENABLE := true
 LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
 include $(DLKM_DIR)/Build_external_kernelmodule.mk
-###########################################################
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES           := $(AUDIO_SRC_FILES)
-LOCAL_MODULE              := lpass_cdc_dlkm.ko
-LOCAL_MODULE_KBUILD_NAME  := asoc/codecs/lpass-cdc/lpass_cdc_dlkm.ko
-LOCAL_MODULE_TAGS         := optional
-LOCAL_MODULE_DEBUG_ENABLE := true
-LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
-include $(DLKM_DIR)/Build_external_kernelmodule.mk
-###########################################################
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES           := $(AUDIO_SRC_FILES)
-LOCAL_MODULE              := lpass_cdc_va_macro_dlkm.ko
-LOCAL_MODULE_KBUILD_NAME  := asoc/codecs/lpass-cdc/lpass_cdc_va_macro_dlkm.ko
-LOCAL_MODULE_TAGS         := optional
-LOCAL_MODULE_DEBUG_ENABLE := true
-LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
-include $(DLKM_DIR)/Build_external_kernelmodule.mk
-###########################################################
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES           := $(AUDIO_SRC_FILES)
-LOCAL_MODULE              := lpass_cdc_tx_macro_dlkm.ko
-LOCAL_MODULE_KBUILD_NAME  := asoc/codecs/lpass-cdc/lpass_cdc_tx_macro_dlkm.ko
-LOCAL_MODULE_TAGS         := optional
-LOCAL_MODULE_DEBUG_ENABLE := true
-LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
-include $(DLKM_DIR)/Build_external_kernelmodule.mk
-###########################################################
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES           := $(AUDIO_SRC_FILES)
-LOCAL_MODULE              := lpass_cdc_rx_macro_dlkm.ko
-LOCAL_MODULE_KBUILD_NAME  := asoc/codecs/lpass-cdc/lpass_cdc_rx_macro_dlkm.ko
-LOCAL_MODULE_TAGS         := optional
-LOCAL_MODULE_DEBUG_ENABLE := true
-LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
-include $(DLKM_DIR)/Build_external_kernelmodule.mk
 endif
 ###########################################################
 ifeq ($(AUDIO_DLKM_ENABLE), true)

EnableBazel.mk

@@ -59,9 +59,12 @@ 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/wcd9xxx_dlkm.ko
+LOCAL_MODULE_KO_DIRS += asoc/codecs/swr_haptics_dlkm.ko
 LOCAL_MODULE_KO_DIRS += asoc/codecs/stub_dlkm.ko
 LOCAL_MODULE_KO_DIRS += asoc/machine_dlkm.ko
 LOCAL_MODULE_KO_DIRS += asoc/codecs/lpass-cdc/lpass_cdc_dlkm.ko
+LOCAL_MODULE_KO_DIRS += asoc/codecs/lpass-cdc/lpass_cdc_wsa_macro_dlkm.ko
+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
@@ -140,34 +143,3 @@ 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/hdmi_dlkm.ko
 endif
-
-ifeq ($(call is-board-platform-in-list,pitti),true)
-LOCAL_MODULE_DDK_BUILD := true
-
-LOCAL_MODULE_KO_DIRS := dsp/q6_notifier_dlkm.ko
-LOCAL_MODULE_KO_DIRS += dsp/spf_core_dlkm.ko
-LOCAL_MODULE_KO_DIRS += dsp/audpkt_ion_dlkm.ko
-LOCAL_MODULE_KO_DIRS += ipc/gpr_dlkm.ko
-LOCAL_MODULE_KO_DIRS += ipc/audio_pkt_dlkm.ko
-LOCAL_MODULE_KO_DIRS += dsp/q6_dlkm.ko
-LOCAL_MODULE_KO_DIRS += dsp/adsp_loader_dlkm.ko
-LOCAL_MODULE_KO_DIRS += dsp/audio_prm_dlkm.ko
-LOCAL_MODULE_KO_DIRS += dsp/q6_pdr_dlkm.ko
-LOCAL_MODULE_KO_DIRS += soc/pinctrl_lpi_dlkm.ko
-LOCAL_MODULE_KO_DIRS += soc/swr_dlkm.ko
-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/wcd9xxx_dlkm.ko
-LOCAL_MODULE_KO_DIRS += asoc/codecs/stub_dlkm.ko
-LOCAL_MODULE_KO_DIRS += asoc/machine_dlkm.ko
-LOCAL_MODULE_KO_DIRS += asoc/codecs/lpass-cdc/lpass_cdc_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/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

audio_kernel_modules.mk

@@ -30,7 +30,7 @@ AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/q6_notifier_dlkm.ko\
 	$(KERNEL_MODULES_OUT)/wcd9xxx_dlkm.ko \
 	$(KERNEL_MODULES_OUT)/stub_dlkm.ko \
 	$(KERNEL_MODULES_OUT)/machine_dlkm.ko
-ifneq ($(call is-board-platform-in-list,bengal holi blair pitti), true)
+ifneq ($(call is-board-platform-in-list,bengal holi blair), true)
 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 \
@@ -57,11 +57,6 @@ endif
 
 ifeq ($(call is-board-platform-in-list, pitti), true)
 AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/wsa881x_analog_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/hdmi_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)/wcd9378_dlkm.ko \
 	$(KERNEL_MODULES_OUT)/wcd9378_slave_dlkm.ko
 endif

build/pitti.bzl

@@ -24,12 +24,15 @@ def define_pitti():
             "wcd_core_dlkm",
             "mbhc_dlkm",
             "wcd9xxx_dlkm",
+            "swr_haptics_dlkm",
             "stub_dlkm",
             "hdmi_dlkm",
             "lpass_cdc_dlkm",
             "lpass_cdc_va_macro_dlkm",
             "lpass_cdc_rx_macro_dlkm",
             "lpass_cdc_tx_macro_dlkm",
+            "lpass_cdc_wsa2_macro_dlkm",
+            "lpass_cdc_wsa_macro_dlkm",
             "wsa881x_analog_dlkm",
             "wcd9378_dlkm",
             "wcd9378_slave_dlkm"

build/volcano.bzl

@@ -47,7 +47,6 @@ def define_volcano():
         ],
         config_options = [
             "CONFIG_SND_SOC_VOLCANO",
-            "CONFIG_SND_SOC_PINEAPPLE",
             "CONFIG_SND_SOC_MSM_QDSP6V2_INTF",
             "CONFIG_MSM_QDSP6_SSR",
             "CONFIG_DIGITAL_CDC_RSC_MGR",