samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

audio-kernel: Update makefiles and config files for blair

Browse Source 
Updated the makefiles to push audio dlkm for blair.

Change-Id: I521aa5a9d520169aae2f23878902311d77d2fe12
This commit is contained in:
Karishma Tekade
2023-04-19 11:55:12 +05:30
committed by Gerrit - the friendly Code Review server
parent 1ed2ece8c4
commit e7118564d5
5 changed files with 57 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Android.mk
View File

@@ -14,6 +14,10 @@ ifeq ($(call is-board-platform, bengal),true)
AUDIO_SELECT := CONFIG_SND_SOC_BENGAL=m AUDIO_SELECT := CONFIG_SND_SOC_BENGAL=m
endif endif
ifeq ($(call is-board-platform, holi blair),true)
AUDIO_SELECT := CONFIG_SND_SOC_HOLI=m
endif
ifeq ($(call is-board-platform, pineapple),true) ifeq ($(call is-board-platform, pineapple),true)
AUDIO_SELECT := CONFIG_SND_SOC_PINEAPPLE=m AUDIO_SELECT := CONFIG_SND_SOC_PINEAPPLE=m
endif endif
@@ -23,7 +27,7 @@ include $(call all-subdir-makefiles)
endif endif
# Build/Package only in case of supported target # Build/Package only in case of supported target
ifeq ($(call is-board-platform-in-list,taro kalama bengal pineapple), true) ifeq ($(call is-board-platform-in-list,taro kalama bengal pineapple holi blair), true)
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
@@ -48,7 +52,10 @@ KBUILD_OPTIONS := AUDIO_ROOT=$(AUDIO_BLD_DIR)
KBUILD_OPTIONS += MODNAME=audio_dlkm KBUILD_OPTIONS += MODNAME=audio_dlkm
KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM) KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM)
KBUILD_OPTIONS += $(AUDIO_SELECT) KBUILD_OPTIONS += $(AUDIO_SELECT)
ifneq ($(call is-board-platform-in-list, bengal holi blair),true)
KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS=$(PWD)/$(call intermediates-dir-for,DLKM,msm-ext-disp-module-symvers)/Module.symvers KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS=$(PWD)/$(call intermediates-dir-for,DLKM,msm-ext-disp-module-symvers)/Module.symvers
endif
AUDIO_SRC_FILES := \ AUDIO_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/*) \ $(wildcard $(LOCAL_PATH)/*) \
@@ -196,7 +203,7 @@ 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
########################################################### ###########################################################
ifneq ($(call is-board-platform-in-list, bengal),true) ifneq ($(call is-board-platform-in-list, bengal holi blair),true)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(AUDIO_SRC_FILES) LOCAL_SRC_FILES := $(AUDIO_SRC_FILES)
LOCAL_MODULE := swr_dmic_dlkm.ko LOCAL_MODULE := swr_dmic_dlkm.ko
@@ -216,7 +223,7 @@ 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
########################################################### ###########################################################
ifneq ($(call is-board-platform-in-list, bengal),true) ifneq ($(call is-board-platform-in-list, bengal holi blair),true)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(AUDIO_SRC_FILES) LOCAL_SRC_FILES := $(AUDIO_SRC_FILES)
LOCAL_MODULE := swr_haptics_dlkm.ko LOCAL_MODULE := swr_haptics_dlkm.ko
@@ -245,7 +252,7 @@ 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
########################### LPASS-CDC CODEC ########################### ########################### LPASS-CDC CODEC ###########################
ifneq ($(call is-board-platform-in-list, bengal),true) ifneq ($(call is-board-platform-in-list, bengal holi blair),true)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(AUDIO_SRC_FILES) LOCAL_SRC_FILES := $(AUDIO_SRC_FILES)
LOCAL_MODULE := lpass_cdc_dlkm.ko LOCAL_MODULE := lpass_cdc_dlkm.ko
@@ -369,7 +376,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(call intermediates-dir-for,DLKM,msm-ext-disp-
include $(DLKM_DIR)/Build_external_kernelmodule.mk include $(DLKM_DIR)/Build_external_kernelmodule.mk
endif endif
ifeq ($(call is-board-platform-in-list, bengal),true) ifeq ($(call is-board-platform-in-list, bengal holi blair),true)
########################################################### ###########################################################
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(AUDIO_SRC_FILES) LOCAL_SRC_FILES := $(AUDIO_SRC_FILES)
@@ -434,6 +441,27 @@ 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 endif
ifeq ($(call is-board-platform-in-list,holi blair),true)
########################### WCD938x CODEC ################################
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(AUDIO_SRC_FILES)
LOCAL_MODULE := wcd938x_dlkm.ko
LOCAL_MODULE_KBUILD_NAME := asoc/codecs/wcd938x/wcd938x_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 := wcd938x_slave_dlkm.ko
LOCAL_MODULE_KBUILD_NAME := asoc/codecs/wcd938x/wcd938x_slave_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
##########################################################
endif # DLKM check endif # DLKM check
endif # supported target check endif # supported target check

8
audio_kernel_modules.mk
View File

@@ -30,7 +30,7 @@ AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/q6_notifier_dlkm.ko\
$(KERNEL_MODULES_OUT)/wcd9xxx_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd9xxx_dlkm.ko \
$(KERNEL_MODULES_OUT)/stub_dlkm.ko \ $(KERNEL_MODULES_OUT)/stub_dlkm.ko \
$(KERNEL_MODULES_OUT)/machine_dlkm.ko $(KERNEL_MODULES_OUT)/machine_dlkm.ko
ifneq ($(call is-board-platform-in-list,bengal), true) ifneq ($(call is-board-platform-in-list,bengal holi blair), 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)/hdmi_dlkm.ko \
@@ -47,7 +47,7 @@ AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/swr_dmic_dlkm.ko \
$(KERNEL_MODULES_OUT)/wcd939x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd939x_dlkm.ko \
$(KERNEL_MODULES_OUT)/wcd939x_slave_dlkm.ko $(KERNEL_MODULES_OUT)/wcd939x_slave_dlkm.ko
endif endif
ifeq ($(call is-board-platform-in-list,bengal), true) ifeq ($(call is-board-platform-in-list,bengal holi blair), true)
AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/bolero_cdc_dlkm.ko \ AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/bolero_cdc_dlkm.ko \
$(KERNEL_MODULES_OUT)/va_macro_dlkm.ko \ $(KERNEL_MODULES_OUT)/va_macro_dlkm.ko \
$(KERNEL_MODULES_OUT)/tx_macro_dlkm.ko \ $(KERNEL_MODULES_OUT)/tx_macro_dlkm.ko \
@@ -56,6 +56,10 @@ AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/bolero_cdc_dlkm.ko \
$(KERNEL_MODULES_OUT)/wcd937x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd937x_dlkm.ko \
$(KERNEL_MODULES_OUT)/wcd937x_slave_dlkm.ko $(KERNEL_MODULES_OUT)/wcd937x_slave_dlkm.ko
endif endif
ifeq ($(call is-board-platform-in-list, holi blair), true)
AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/wcd938x_dlkm.ko \
$(KERNEL_MODULES_OUT)/wcd938x_slave_dlkm.ko
endif
endif endif
endif endif
endif endif

10
audio_kernel_product_board.mk
View File

@@ -17,7 +17,7 @@ PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/q6_notifier_dlkm.ko\
$(KERNEL_MODULES_OUT)/wcd9xxx_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd9xxx_dlkm.ko \
$(KERNEL_MODULES_OUT)/stub_dlkm.ko \ $(KERNEL_MODULES_OUT)/stub_dlkm.ko \
$(KERNEL_MODULES_OUT)/machine_dlkm.ko $(KERNEL_MODULES_OUT)/machine_dlkm.ko
ifneq ($(call is-board-platform-in-list,bengal), true) ifneq ($(call is-board-platform-in-list,bengal holi blair), 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)/hdmi_dlkm.ko \
@@ -34,12 +34,16 @@ PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/swr_dmic_dlkm.ko \
$(KERNEL_MODULES_OUT)/wcd939x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd939x_dlkm.ko \
$(KERNEL_MODULES_OUT)/wcd939x_slave_dlkm.ko $(KERNEL_MODULES_OUT)/wcd939x_slave_dlkm.ko
endif endif
ifeq ($(call is-board-platform-in-list,bengal), true) ifeq ($(call is-board-platform-in-list,bengal holi blair), true)
PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/bolero_cdc_dlkm.ko \ PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/bolero_cdc_dlkm.ko \
$(KERNEL_MODULES_OUT)/va_macro_dlkm.ko \ $(KERNEL_MODULES_OUT)/va_macro_dlkm.ko \
$(KERNEL_MODULES_OUT)/tx_macro_dlkm.ko \ $(KERNEL_MODULES_OUT)/tx_macro_dlkm.ko \
$(KERNEL_MODULES_OUT)/rx_macro_dlkm.ko \ $(KERNEL_MODULES_OUT)/rx_macro_dlkm.ko \
$(KERNEL_MODULES_OUT)/wsa881x_analog_dlkm.ko \ $(KERNEL_MODULES_OUT)/wsa881x_analog_dlkm.ko \
$(KERNEL_MODULES_OUT)/wcd938x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd937x_dlkm.ko \
$(KERNEL_MODULES_OUT)/wcd937x_slave_dlkm.ko
endif
ifeq ($(call is-board-platform-in-list, holi blair), true)
PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/wcd938x_dlkm.ko \
$(KERNEL_MODULES_OUT)/wcd938x_slave_dlkm.ko $(KERNEL_MODULES_OUT)/wcd938x_slave_dlkm.ko
endif endif

5
config/holiauto.conf
View File

@@ -4,12 +4,17 @@ export CONFIG_SND_SOC_WCD9XXX_V2=m
export CONFIG_SND_SOC_WCD_MBHC=m export CONFIG_SND_SOC_WCD_MBHC=m
export CONFIG_WCD9XXX_CODEC_CORE_V2=m export CONFIG_WCD9XXX_CODEC_CORE_V2=m
export CONFIG_MSM_CDC_PINCTRL=m export CONFIG_MSM_CDC_PINCTRL=m
export CONFIG_AUDIO_PKT_ION=m
export CONFIG_MSM_QDSP6V2_CODECS=m export CONFIG_MSM_QDSP6V2_CODECS=m
export CONFIG_MSM_QDSP6_APRV2_RPMSG=m export CONFIG_MSM_QDSP6_APRV2_RPMSG=m
export CONFIG_MSM_ADSP_LOADER=m export CONFIG_MSM_ADSP_LOADER=m
export CONFIG_REGMAP_SWR=m export CONFIG_REGMAP_SWR=m
export CONFIG_SPF_CORE=m
export CONFIG_MSM_QDSP6_SSR=m export CONFIG_MSM_QDSP6_SSR=m
export CONFIG_MSM_QDSP6_GPR_RPMSG=m
export CONFIG_MSM_QDSP6_PDR=m export CONFIG_MSM_QDSP6_PDR=m
export CONFIG_AUDIO_PRM=m
export CONFIG_AUDIO_PKT=m
export CONFIG_MSM_QDSP6_NOTIFIER=m export CONFIG_MSM_QDSP6_NOTIFIER=m
export CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m export CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m
export CONFIG_SOUNDWIRE=m export CONFIG_SOUNDWIRE=m

6
config/holiautoconf.h
View File

@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
/* Copyright (c) 2020, The Linux Foundation. All rights reserved. /* Copyright (c) 2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
#define CONFIG_PINCTRL_LPI 1 #define CONFIG_PINCTRL_LPI 1
@@ -13,9 +14,14 @@
#define CONFIG_SND_SOC_MSM_QDSP6V2_INTF 1 #define CONFIG_SND_SOC_MSM_QDSP6V2_INTF 1
#define CONFIG_MSM_ADSP_LOADER 1 #define CONFIG_MSM_ADSP_LOADER 1
#define CONFIG_REGMAP_SWR 1 #define CONFIG_REGMAP_SWR 1
#define CONFIG_AUDIO_PKT_ION 1
#define CONFIG_MSM_QDSP6_SSR 1 #define CONFIG_MSM_QDSP6_SSR 1
#define CONFIG_MSM_QDSP6_PDR 1 #define CONFIG_MSM_QDSP6_PDR 1
#define CONFIG_MSM_QDSP6_NOTIFIER 1 #define CONFIG_MSM_QDSP6_NOTIFIER 1
#define CONFIG_SPF_CORE 1
#define CONFIG_MSM_QDSP6_GPR_RPMSG 1
#define CONFIG_AUDIO_PRM 1
#define CONFIG_AUDIO_PKT 1
#define CONFIG_SOUNDWIRE 1 #define CONFIG_SOUNDWIRE 1
#define CONFIG_SOUNDWIRE_MSTR_CTRL 1 #define CONFIG_SOUNDWIRE_MSTR_CTRL 1
#define CONFIG_SND_SOC_WCD_MBHC_ADC 1 #define CONFIG_SND_SOC_WCD_MBHC_ADC 1