audio-kernel: Enable hdmi codec driver for taro

Enable hdmi codec driver compilation for taro platform. Change-Id: Ic0912d56427cb2b98d816258c79a7609f4237349 Signed-off-by: Phani Kumar Uppalapati <phaniu@codeaurora.org>
2021-03-13 08:10:05 -08:00
parent 932b967501
commit d689e0abe2
8 changed files with 19 additions and 14 deletions
--- a/Android.mk
+++ b/Android.mk
@@ -312,6 +312,15 @@ LOCAL_MODULE_DEBUG_ENABLE := true
 LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
 include $(DLKM_DIR)/Build_external_kernelmodule.mk
 ###########################################################
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES   := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
+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)
+include $(DLKM_DIR)/Build_external_kernelmodule.mk
+###########################################################

 $(shell cp $(LOCAL_PATH)/include/uapi/audio/linux/* $(UAPI_OUT)/linux)
 $(shell cp $(LOCAL_PATH)/include/uapi/audio/sound/* $(UAPI_OUT)/sound)
--- a/asoc/codecs/Kbuild
+++ b/asoc/codecs/Kbuild
@@ -202,10 +202,8 @@ ifdef CONFIG_SND_SOC_WCD_MBHC_LEGACY
 endif

 ifdef CONFIG_SND_SOC_MSM_HDMI_CODEC_RX
-ifdef CONFIG_AUDIO_QGKI
 	HDMICODEC_OBJS += msm_hdmi_codec_rx.o
 endif
-endif

 ifdef CONFIG_SND_SOC_WCD_IRQ
 	CORE_OBJS += wcd-irq.o
@@ -290,10 +288,8 @@ wcd_spi_dlkm-y := $(SPI_OBJS)
 obj-$(CONFIG_SND_SOC_WCD_MBHC) += mbhc_dlkm.o
 mbhc_dlkm-y := $(MBHC_OBJS)

-ifdef CONFIG_AUDIO_QGKI
 obj-$(CONFIG_SND_SOC_MSM_HDMI_CODEC_RX) += hdmi_dlkm.o
 hdmi_dlkm-y := $(HDMICODEC_OBJS)
-endif

 obj-$(CONFIG_SND_SWR_HAPTICS) += swr_haptics_dlkm.o
 swr_haptics_dlkm-y := $(SWR_HAP_OBJS)
--- a/asoc/msm_dailink.h
+++ b/asoc/msm_dailink.h
@@ -29,13 +29,15 @@ SND_SOC_DAILINK_DEFS(slimbus_7_tx,

 SND_SOC_DAILINK_DEFS(display_port,
 	DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
-	DAILINK_COMP_ARRAY(COMP_CODEC("msm-ext-disp-audio-codec-rx",
+	DAILINK_COMP_ARRAY(COMP_CODEC(
+			"soc:qcom,msm-ext-disp:qcom,msm-ext-disp-audio-codec-rx",
 			"msm_dp_audio_codec_rx_dai")),
 	DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));

 SND_SOC_DAILINK_DEFS(display_port1,
 	DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
-	DAILINK_COMP_ARRAY(COMP_CODEC("msm-ext-disp-audio-codec-rx",
+	DAILINK_COMP_ARRAY(COMP_CODEC(
+			"soc:qcom,msm-ext-disp:qcom,msm-ext-disp-audio-codec-rx",
 			"msm_dp_audio_codec_rx1_dai")),
 	DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));

--- a/asoc/waipio.c
+++ b/asoc/waipio.c
@@ -434,7 +434,6 @@ static struct snd_soc_dai_link msm_wcn_be_dai_links[] = {
 	},
 };

-#if IS_ENABLED(CONFIG_AUDIO_QGKI)
 static struct snd_soc_dai_link ext_disp_be_dai_link[] = {
 	/* DISP PORT BACK END DAI Link */
 	{
@@ -448,7 +447,6 @@ static struct snd_soc_dai_link ext_disp_be_dai_link[] = {
 		SND_SOC_DAILINK_REG(display_port),
 	},
 };
-#endif

 static struct snd_soc_dai_link msm_wsa_cdc_dma_be_dai_links[] = {
 	/* WSA CDC DMA Backend DAI Links */
@@ -926,9 +924,7 @@ static struct snd_soc_dai_link msm_waipio_dai_links[
 #endif
 			ARRAY_SIZE(msm_rx_tx_cdc_dma_be_dai_links) +
 			ARRAY_SIZE(msm_va_cdc_dma_be_dai_links) +
-#if IS_ENABLED(CONFIG_AUDIO_QGKI)
 			ARRAY_SIZE(ext_disp_be_dai_link) +
-#endif
 			ARRAY_SIZE(msm_common_be_dai_links) +
 			ARRAY_SIZE(msm_wcn_be_dai_links) +
 			ARRAY_SIZE(msm_mi2s_dai_links) +
@@ -1189,7 +1185,6 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev)
 			total_links += ARRAY_SIZE(msm_tdm_dai_links);
 		}

-#if IS_ENABLED(CONFIG_AUDIO_QGKI)
 		rc = of_property_read_u32(dev->of_node,
 					   "qcom,ext-disp-audio-rx", &val);
 		if (!rc && val) {
@@ -1200,7 +1195,6 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev)
 			       sizeof(ext_disp_be_dai_link));
 			total_links += ARRAY_SIZE(ext_disp_be_dai_link);
 		}
-#endif

 		rc = of_property_read_u32(dev->of_node, "qcom,wcn-bt", &val);
 		if (!rc && val) {
--- a/audio_kernel_product_board.mk
+++ b/audio_kernel_product_board.mk
@@ -27,4 +27,5 @@ PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/q6_notifier_dlkm.ko\
 	$(KERNEL_MODULES_OUT)/lpass_cdc_dlkm.ko \
 	$(KERNEL_MODULES_OUT)/wsa883x_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)/hdmi_dlkm.ko
--- a/audio_kernel_vendor_board.mk
+++ b/audio_kernel_vendor_board.mk
@@ -29,6 +29,7 @@ BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/q6_notifier_dlkm.ko\
 	$(KERNEL_MODULES_OUT)/lpass_cdc_dlkm.ko \
 	$(KERNEL_MODULES_OUT)/wsa883x_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)/hdmi_dlkm.ko
 endif
 endif
--- a/config/waipioauto.conf
+++ b/config/waipioauto.conf
@@ -32,3 +32,4 @@ export CONFIG_SND_SOC_WCD_MBHC_ADC=m
 export CONFIG_SND_SOC_SWR_DMIC=m
 export CONFIG_SND_SWR_HAPTICS=m
 export CONFIG_SND_SOC_MSM_STUB=m
+export CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
--- a/config/waipioautoconf.h
+++ b/config/waipioautoconf.h
@@ -37,3 +37,4 @@
 #define CONFIG_SND_SOC_SWR_DMIC 1
 #define CONFIG_SND_SWR_HAPTICS 1
 #define CONFIG_SND_SOC_MSM_STUB 1
+#define CONFIG_SND_SOC_MSM_HDMI_CODEC_RX 1