Browse Source

audio-kernel: Remove HDMI DLKM for pineapple

Remove HDMI DLKM for pineapple(temp change to fix compilation issues).

Change-Id: I2d279a804929ccda7e6d5d7d9b5d92d3ac787889
Signed-off-by: Prasad Kumpatla <[email protected]>
Yuhui Zhao 2 years ago
parent
commit
658c4603bd

+ 1 - 11
Android.mk

@@ -338,18 +338,8 @@ 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              := 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)
 ###########################################################

+ 0 - 7
asoc/codecs/Kbuild

@@ -209,10 +209,6 @@ ifdef CONFIG_SND_SOC_WCD_MBHC_LEGACY
 	MBHC_OBJS += wcd-mbhc-legacy.o
 endif
 
-ifdef CONFIG_SND_SOC_MSM_HDMI_CODEC_RX
-	HDMICODEC_OBJS += msm_hdmi_codec_rx.o
-endif
-
 ifdef CONFIG_SND_SOC_WCD_IRQ
 	CORE_OBJS += wcd-irq.o
 endif
@@ -297,9 +293,6 @@ wcd_spi_dlkm-y := $(SPI_OBJS)
 obj-$(CONFIG_SND_SOC_WCD_MBHC) += mbhc_dlkm.o
 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
 swr_haptics_dlkm-y := $(SWR_HAP_OBJS)
 

+ 0 - 1
audio_kernel_modules.mk

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

+ 0 - 1
audio_kernel_product_board.mk

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

+ 0 - 1
config/pineappleauto.conf

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

+ 0 - 1
config/pineappleautoconf.h

@@ -39,6 +39,5 @@
 #define CONFIG_SND_SOC_WCD_MBHC_ADC 1
 #define CONFIG_SND_SWR_HAPTICS 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_SND_SOC_SWR_DMIC 1