diff --git a/Android.mk b/Android.mk index d75074bb60..2458c03122 100644 --- a/Android.mk +++ b/Android.mk @@ -415,6 +415,35 @@ LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/Build_external_kernelmodule.mk endif +ifeq ($(call is-board-platform-in-list, pitti),true) +########################################################### +include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(AUDIO_SRC_FILES) +LOCAL_MODULE := wsa881x_analog_dlkm.ko +LOCAL_MODULE_KBUILD_NAME := asoc/codecs/wsa881x_analog_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 := wcd9378_dlkm.ko +LOCAL_MODULE_KBUILD_NAME := asoc/codecs/wcd9378/wcd9378_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 := wcd9378_slave_dlkm.ko +LOCAL_MODULE_KBUILD_NAME := asoc/codecs/wcd9378/wcd9378_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 ########################################################### ifeq ($(AUDIO_DLKM_ENABLE), true) include $(CLEAR_VARS) @@ -516,16 +545,6 @@ LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/Build_external_kernelmodule.mk endif -ifeq ($(call is-board-platform-in-list,pitti),true) -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(AUDIO_SRC_FILES) -LOCAL_MODULE := wsa881x_analog_dlkm.ko -LOCAL_MODULE_KBUILD_NAME := asoc/codecs/wsa881x_analog_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 # supported target check diff --git a/EnableBazel.mk b/EnableBazel.mk index 7bb39ffa50..f5ad3ee0b5 100644 --- a/EnableBazel.mk +++ b/EnableBazel.mk @@ -38,7 +38,6 @@ LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd939x/wcd939x_slave_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/hdmi_dlkm.ko endif - ifeq ($(call is-board-platform-in-list,pitti),true) LOCAL_MODULE_DDK_BUILD := true @@ -75,10 +74,11 @@ LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd938x/wcd938x_slave_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/wsa881x_analog_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/wsa883x/wsa883x_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/wsa884x/wsa884x_dlkm.ko +LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd9378/wcd9378_dlkm.ko +LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd9378/wcd9378_slave_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/hdmi_dlkm.ko endif - ifeq ($(call is-board-platform-in-list,blair),true) LOCAL_MODULE_DDK_BUILD := true @@ -149,3 +149,39 @@ LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd938x/wcd938x_slave_dlkm.ko LOCAL_MODULE_KO_DIRS += asoc/codecs/hdmi_dlkm.ko endif +ifeq ($(call is-board-platform-in-list,pitti),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/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/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/wcd9378/wcd9378_dlkm.ko +LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd9378/wcd9378_slave_dlkm.ko +LOCAL_MODULE_KO_DIRS += asoc/codecs/wsa881x_analog_dlkm.ko +LOCAL_MODULE_KO_DIRS += asoc/codecs/hdmi_dlkm.ko +endif \ No newline at end of file diff --git a/Kbuild b/Kbuild index 3a0c972611..dfcc7190e9 100644 --- a/Kbuild +++ b/Kbuild @@ -1 +1 @@ -obj-y := dsp/ ipc/ soc/ asoc/ asoc/codecs/ asoc/codecs/lpass-cdc/ asoc/codecs/bolero/ asoc/codecs/wcd939x/ asoc/codecs/wsa884x/ asoc/codecs/wcd938x/ asoc/codecs/wsa883x/ asoc/codecs/wcd937x/ +obj-y := dsp/ ipc/ soc/ asoc/ asoc/codecs/ asoc/codecs/lpass-cdc/ asoc/codecs/bolero/ asoc/codecs/wcd939x/ asoc/codecs/wsa884x/ asoc/codecs/wcd938x/ asoc/codecs/wsa883x/ asoc/codecs/wcd937x/ asoc/codecs/wcd9378/ diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild index 191a90446b..ce25c76703 100644 --- a/asoc/codecs/Kbuild +++ b/asoc/codecs/Kbuild @@ -283,6 +283,7 @@ ifeq ($(KERNEL_BUILD), 1) obj-y += wcd937x/ obj-y += wcd938x/ obj-y += wcd939x/ + obj-y += wcd9378/ obj-y += bolero/ obj-y += lpass-cdc/ obj-y += wsa884x/ diff --git a/audio_kernel_modules.mk b/audio_kernel_modules.mk index 868f50920b..8b0c842640 100644 --- a/audio_kernel_modules.mk +++ b/audio_kernel_modules.mk @@ -46,7 +46,9 @@ 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)/wcd938x_slave_dlkm.ko \ + $(KERNEL_MODULES_OUT)/wcd9378_dlkm.ko \ + $(KERNEL_MODULES_OUT)/wcd9378_slave_dlkm.ko ifneq ($(call is-board-platform-in-list,niobe pitti), true) AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/wcd939x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd939x_slave_dlkm.ko diff --git a/audio_kernel_product_board.mk b/audio_kernel_product_board.mk index da088bc511..cd6f815012 100644 --- a/audio_kernel_product_board.mk +++ b/audio_kernel_product_board.mk @@ -17,24 +17,25 @@ PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/q6_notifier_dlkm.ko\ $(KERNEL_MODULES_OUT)/wcd9xxx_dlkm.ko \ $(KERNEL_MODULES_OUT)/stub_dlkm.ko \ $(KERNEL_MODULES_OUT)/machine_dlkm.ko -ifneq ($(call is-board-platform-in-list,bengal holi blair pitti), true) -PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/swr_dmic_dlkm.ko \ - $(KERNEL_MODULES_OUT)/lpass_cdc_wsa2_macro_dlkm.ko \ - $(KERNEL_MODULES_OUT)/lpass_cdc_wsa_macro_dlkm.ko -endif ifneq ($(call is-board-platform-in-list,bengal holi blair), 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 \ $(KERNEL_MODULES_OUT)/lpass_cdc_rx_macro_dlkm.ko \ $(KERNEL_MODULES_OUT)/lpass_cdc_tx_macro_dlkm.ko \ $(KERNEL_MODULES_OUT)/lpass_cdc_dlkm.ko \ - $(KERNEL_MODULES_OUT)/wsa881x_analog_dlkm.ko \ $(KERNEL_MODULES_OUT)/wsa884x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wsa883x_dlkm.ko \ + $(KERNEL_MODULES_OUT)/wsa881x_analog_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)/wcd938x_slave_dlkm.ko \ + $(KERNEL_MODULES_OUT)/wcd9378_dlkm.ko \ + $(KERNEL_MODULES_OUT)/wcd9378_slave_dlkm.ko ifneq ($(call is-board-platform-in-list,niobe pitti), true) PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/wcd939x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd939x_slave_dlkm.ko diff --git a/audio_modules.bzl b/audio_modules.bzl index 603ddc8f09..dff584babe 100644 --- a/audio_modules.bzl +++ b/audio_modules.bzl @@ -443,3 +443,21 @@ audio_modules.register( config_option = "CONFIG_SND_SOC_WCD939X_SLAVE", srcs = ["wcd939x-slave.c"] ) +# >>>> WCD9378 MODULES <<<< +audio_modules.register( + name = "wcd9378_dlkm", + path = ASOC_CODECS_PATH + "/wcd9378", + config_option = "CONFIG_SND_SOC_WCD9378", + srcs = [ + "wcd9378.c", + "wcd9378-regmap.c", + "wcd9378-tables.c", + "wcd9378-mbhc.c", + ] +) +audio_modules.register( + name = "wcd9378_slave_dlkm", + path = ASOC_CODECS_PATH + "/wcd9378", + config_option = "CONFIG_SND_SOC_WCD9378_SLAVE", + srcs = ["wcd9378-slave.c"] +) \ No newline at end of file diff --git a/build/pitti.bzl b/build/pitti.bzl index 9c47f6e729..8d4f314f70 100644 --- a/build/pitti.bzl +++ b/build/pitti.bzl @@ -41,7 +41,8 @@ def define_pitti(): "wcd937x_slave_dlkm", "wcd938x_dlkm", "wcd938x_slave_dlkm", - + "wcd9378_dlkm", + "wcd9378_slave_dlkm" ], config_options = [ "CONFIG_SND_SOC_PITTI", diff --git a/config/pittiauto.conf b/config/pittiauto.conf index c10c5becf7..a16938bab7 100644 --- a/config/pittiauto.conf +++ b/config/pittiauto.conf @@ -32,6 +32,8 @@ export CONFIG_SND_SOC_WCD937X=m export CONFIG_SND_SOC_WCD937X_SLAVE=m export CONFIG_SND_SOC_WCD938X=m export CONFIG_SND_SOC_WCD938X_SLAVE=m +export CONFIG_SND_SOC_WCD9378=m +export CONFIG_SND_SOC_WCD9378_SLAVE=m export CONFIG_SND_SOC_WCD_MBHC=m export CONFIG_SND_SOC_WCD_MBHC_ADC=m export CONFIG_SND_SOC_MSM_STUB=m diff --git a/config/pittiautoconf.h b/config/pittiautoconf.h index ad926a72e5..d55c573b30 100644 --- a/config/pittiautoconf.h +++ b/config/pittiautoconf.h @@ -34,6 +34,8 @@ #define CONFIG_WSA881X_TEMP_SENSOR_DISABLE 1 #define CONFIG_SND_SOC_WCD938X 1 #define CONFIG_SND_SOC_WCD938X_SLAVE 1 +#define CONFIG_SND_SOC_WCD9378 1 +#define CONFIG_SND_SOC_WCD9378_SLAVE 1 #define CONFIG_SND_SOC_WCD_MBHC 1 #define CONFIG_SND_SOC_WCD_MBHC_ADC 1 #define CONFIG_SND_SOC_MSM_STUB 1