Revert "audio-kernel: Remove HDMI DLKM for pineapple"

This reverts commit 658c4603bd.
Enable external display audio support for pineapple target.

Change-Id: Ibc03794b90c2ba83e4e3d27bbf997f86588e63c2
This commit is contained in:
Phani Kumar Uppalapati
2022-11-21 13:00:44 -08:00
committed by Gerrit - the friendly Code Review server
parent 04f76568d1
commit 988ffe7fbf
6 changed files with 22 additions and 1 deletions

View File

@@ -356,8 +356,18 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_DEBUG_ENABLE := true
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/Build_external_kernelmodule.mk include $(DLKM_DIR)/Build_external_kernelmodule.mk
endif
########################################################### ###########################################################
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(AUDIO_SRC_FILES)
LOCAL_MODULE := hdmi_dlkm.ko
LOCAL_MODULE_KBUILD_NAME := asoc/codecs/hdmi_dlkm.ko
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_DEBUG_ENABLE := true
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
LOCAL_REQUIRED_MODULES := msm-ext-disp-module-symvers
LOCAL_ADDITIONAL_DEPENDENCIES := $(call intermediates-dir-for,DLKM,msm-ext-disp-module-symvers)/Module.symvers
include $(DLKM_DIR)/Build_external_kernelmodule.mk
endif
ifeq ($(call is-board-platform-in-list, bengal),true) ifeq ($(call is-board-platform-in-list, bengal),true)
########################################################### ###########################################################

View File

@@ -209,6 +209,10 @@ ifdef CONFIG_SND_SOC_WCD_MBHC_LEGACY
MBHC_OBJS += wcd-mbhc-legacy.o MBHC_OBJS += wcd-mbhc-legacy.o
endif endif
ifdef CONFIG_SND_SOC_MSM_HDMI_CODEC_RX
HDMICODEC_OBJS += msm_hdmi_codec_rx.o
endif
ifdef CONFIG_SND_SOC_WCD_IRQ ifdef CONFIG_SND_SOC_WCD_IRQ
CORE_OBJS += wcd-irq.o CORE_OBJS += wcd-irq.o
endif endif
@@ -294,6 +298,9 @@ wcd_spi_dlkm-y := $(SPI_OBJS)
obj-$(CONFIG_SND_SOC_WCD_MBHC) += mbhc_dlkm.o obj-$(CONFIG_SND_SOC_WCD_MBHC) += mbhc_dlkm.o
mbhc_dlkm-y := $(MBHC_OBJS) mbhc_dlkm-y := $(MBHC_OBJS)
obj-$(CONFIG_SND_SOC_MSM_HDMI_CODEC_RX) += hdmi_dlkm.o
hdmi_dlkm-y := $(HDMICODEC_OBJS)
obj-$(CONFIG_SND_SWR_HAPTICS) += swr_haptics_dlkm.o obj-$(CONFIG_SND_SWR_HAPTICS) += swr_haptics_dlkm.o
swr_haptics_dlkm-y := $(SWR_HAP_OBJS) swr_haptics_dlkm-y := $(SWR_HAP_OBJS)

View File

@@ -33,6 +33,7 @@ AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/q6_notifier_dlkm.ko\
ifneq ($(call is-board-platform-in-list,bengal), true) ifneq ($(call is-board-platform-in-list,bengal), true)
AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/swr_dmic_dlkm.ko \ AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/swr_dmic_dlkm.ko \
$(KERNEL_MODULES_OUT)/swr_haptics_dlkm.ko \ $(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_wsa2_macro_dlkm.ko \
$(KERNEL_MODULES_OUT)/lpass_cdc_wsa_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_va_macro_dlkm.ko \

View File

@@ -20,6 +20,7 @@ PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/q6_notifier_dlkm.ko\
ifneq ($(call is-board-platform-in-list,bengal), true) ifneq ($(call is-board-platform-in-list,bengal), true)
PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/swr_dmic_dlkm.ko \ PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/swr_dmic_dlkm.ko \
$(KERNEL_MODULES_OUT)/swr_haptics_dlkm.ko \ $(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_wsa2_macro_dlkm.ko \
$(KERNEL_MODULES_OUT)/lpass_cdc_wsa_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_va_macro_dlkm.ko \

View File

@@ -34,4 +34,5 @@ export CONFIG_SND_SOC_WCD_MBHC=m
export CONFIG_SND_SOC_WCD_MBHC_ADC=m export CONFIG_SND_SOC_WCD_MBHC_ADC=m
export CONFIG_SND_SWR_HAPTICS=m export CONFIG_SND_SWR_HAPTICS=m
export CONFIG_SND_SOC_MSM_STUB=m export CONFIG_SND_SOC_MSM_STUB=m
export CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
export CONFIG_SND_SOC_SWR_DMIC=m export CONFIG_SND_SOC_SWR_DMIC=m

View File

@@ -41,5 +41,6 @@
#define CONFIG_SND_SOC_WCD_MBHC_ADC 1 #define CONFIG_SND_SOC_WCD_MBHC_ADC 1
#define CONFIG_SND_SWR_HAPTICS 1 #define CONFIG_SND_SWR_HAPTICS 1
#define CONFIG_SND_SOC_MSM_STUB 1 #define CONFIG_SND_SOC_MSM_STUB 1
#define CONFIG_SND_SOC_MSM_HDMI_CODEC_RX 1
#define CONFIG_MSM_EXT_DISPLAY 1 #define CONFIG_MSM_EXT_DISPLAY 1
#define CONFIG_SND_SOC_SWR_DMIC 1 #define CONFIG_SND_SOC_SWR_DMIC 1