diff --git a/Android.mk b/Android.mk index 53d29b520a..c89212d371 100644 --- a/Android.mk +++ b/Android.mk @@ -28,7 +28,7 @@ LOCAL_PATH := vendor/qcom/opensource/audio-kernel endif # Build/Package only in case of supported target -ifeq ($(call is-board-platform-in-list,taro kalama bengal pineapple cliffs pitti holi blair gen4 msmnile), true) +ifeq ($(call is-board-platform-in-list,taro kalama bengal pineapple cliffs pitti holi blair gen4 msmnile niobe), true) # This makefile is only for DLKM ifneq ($(findstring vendor,$(LOCAL_PATH)),) @@ -391,6 +391,8 @@ LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/Build_external_kernelmodule.mk ########################### WCD939x CODEC ################################ + +ifneq ($(call is-board-platform-in-list, niobe),true) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(AUDIO_SRC_FILES) LOCAL_MODULE := wcd939x_dlkm.ko @@ -408,6 +410,7 @@ 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) include $(CLEAR_VARS) diff --git a/BUILD.bazel b/BUILD.bazel index 0631cf78c2..475df85a9e 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -48,7 +48,9 @@ ddk_headers( load(":build/pineapple.bzl", "define_pineapple") load(":build/kalama.bzl", "define_kalama") load(":build/blair.bzl", "define_blair") +load(":build/niobe.bzl", "define_niobe") define_kalama() define_pineapple() define_blair() +define_niobe() diff --git a/EnableBazel.mk b/EnableBazel.mk index 9d3d2fd856..4eb2473d4e 100644 --- a/EnableBazel.mk +++ b/EnableBazel.mk @@ -69,3 +69,42 @@ LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd937x/wcd937x_slave_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd938x/wcd938x_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd938x/wcd938x_slave_dlkm.ko endif + +ifeq ($(call is-board-platform-in-list, niobe),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/swr_dmic_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_wsa2_macro_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_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/wsa884x/wsa884x_dlkm.ko +LOCAL_MODULE_KO_DIRS += asoc/codecs/wsa883x/wsa883x_dlkm.ko +LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd937x/wcd937x_dlkm.ko +LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd937x/wcd937x_slave_dlkm.ko +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 + diff --git a/audio_kernel_modules.mk b/audio_kernel_modules.mk index 27b2ca29a6..efbc684d32 100644 --- a/audio_kernel_modules.mk +++ b/audio_kernel_modules.mk @@ -45,10 +45,12 @@ AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/swr_dmic_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd937x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd937x_slave_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd938x_dlkm.ko \ - $(KERNEL_MODULES_OUT)/wcd938x_slave_dlkm.ko \ - $(KERNEL_MODULES_OUT)/wcd939x_dlkm.ko \ + $(KERNEL_MODULES_OUT)/wcd938x_slave_dlkm.ko +ifneq ($(call is-board-platform-in-list,niobe), true) +AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/wcd939x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd939x_slave_dlkm.ko endif +endif ifeq ($(call is-board-platform-in-list,bengal holi blair), true) AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/bolero_cdc_dlkm.ko \ $(KERNEL_MODULES_OUT)/va_macro_dlkm.ko \ diff --git a/audio_kernel_product_board.mk b/audio_kernel_product_board.mk index 80feb37462..5b77cd8358 100644 --- a/audio_kernel_product_board.mk +++ b/audio_kernel_product_board.mk @@ -30,10 +30,12 @@ PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/swr_dmic_dlkm.ko \ $(KERNEL_MODULES_OUT)/wsa884x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wsa883x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd938x_dlkm.ko \ - $(KERNEL_MODULES_OUT)/wcd938x_slave_dlkm.ko \ - $(KERNEL_MODULES_OUT)/wcd939x_dlkm.ko \ + $(KERNEL_MODULES_OUT)/wcd938x_slave_dlkm.ko +ifneq ($(call is-board-platform-in-list,niobe), true) +PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/wcd939x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd939x_slave_dlkm.ko endif +endif ifeq ($(call is-board-platform-in-list,bengal holi blair), true) PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/bolero_cdc_dlkm.ko \ $(KERNEL_MODULES_OUT)/va_macro_dlkm.ko \ diff --git a/audio_modules.bzl b/audio_modules.bzl index 2a5ec9222c..4f9cc9ce60 100644 --- a/audio_modules.bzl +++ b/audio_modules.bzl @@ -160,6 +160,9 @@ audio_modules.register( "CONFIG_SND_SOC_PINEAPPLE": [ "pineapple.c" ], + "CONFIG_SND_SOC_NIOBE": [ + "pineapple.c" + ], "CONFIG_SND_SOC_HOLI": [ "holi.c" ], diff --git a/build/niobe.bzl b/build/niobe.bzl new file mode 100644 index 0000000000..912ba38722 --- /dev/null +++ b/build/niobe.bzl @@ -0,0 +1,58 @@ +load(":audio_modules.bzl", "audio_modules") +load(":module_mgr.bzl", "define_target_modules") + +def define_niobe(): + define_target_modules( + target = "niobe", + variants = ["consolidate", "gki"], + registry = audio_modules, + modules = [ + "q6_dlkm", + "spf_core_dlkm", + "audpkt_ion_dlkm", + "q6_notifier_dlkm", + "adsp_loader_dlkm", + "audio_prm_dlkm", + "q6_pdr_dlkm", + "gpr_dlkm", + "audio_pkt_dlkm", + "pinctrl_lpi_dlkm", + "swr_dlkm", + "swr_ctrl_dlkm", + "snd_event_dlkm", + "machine_dlkm", + "wcd_core_dlkm", + "mbhc_dlkm", + "swr_dmic_dlkm", + "wcd9xxx_dlkm", + "swr_haptics_dlkm", + "stub_dlkm", + "hdmi_dlkm", + "lpass_cdc_dlkm", + "lpass_cdc_wsa_macro_dlkm", + "lpass_cdc_wsa2_macro_dlkm", + "lpass_cdc_va_macro_dlkm", + "lpass_cdc_rx_macro_dlkm", + "lpass_cdc_tx_macro_dlkm", + "wsa883x_dlkm", + "wsa884x_dlkm", + "wcd937x_dlkm", + "wcd937x_slave_dlkm", + "wcd938x_dlkm", + "wcd938x_slave_dlkm", + ], + config_options = [ + "CONFIG_SND_SOC_NIOBE", + "CONFIG_SND_SOC_MSM_QDSP6V2_INTF", + "CONFIG_MSM_QDSP6_SSR", + "CONFIG_DIGITAL_CDC_RSC_MGR", + "CONFIG_SOUNDWIRE_MSTR_CTRL", + "CONFIG_SWRM_VER_2P0", + "CONFIG_WCD9XXX_CODEC_CORE_V2", + "CONFIG_MSM_CDC_PINCTRL", + "CONFIG_SND_SOC_WCD_IRQ", + "CONFIG_SND_SOC_WCD9XXX_V2", + "CONFIG_SND_SOC_WCD_MBHC_ADC", + "CONFIG_MSM_EXT_DISPLAY", + ] + )