diff options
| -rw-r--r-- | Android.mk | 6 | ||||
| -rw-r--r-- | Kbuild | 2 | ||||
| -rw-r--r-- | asoc/codecs/Kbuild | 1 | ||||
| -rw-r--r-- | asoc/codecs/wsa884x/Kbuild | 4 | ||||
| -rw-r--r-- | audio_kernel_product_board.mk | 2 | ||||
| -rw-r--r-- | audio_kernel_vendor_board.mk | 2 | ||||
| -rw-r--r-- | config/kalamaauto.conf | 2 | ||||
| -rw-r--r-- | config/kalamaautoconf.h | 2 |
8 files changed, 12 insertions, 9 deletions
@@ -282,11 +282,11 @@ LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/Build_external_kernelmodule.mk -########################### WSA883x CODEC ########################### +########################### WSA884x CODEC ########################### include $(CLEAR_VARS) LOCAL_SRC_FILES := $(AUDIO_SRC_FILES) -LOCAL_MODULE := wsa883x_dlkm.ko -LOCAL_MODULE_KBUILD_NAME := asoc/codecs/wsa883x/wsa883x_dlkm.ko +LOCAL_MODULE := wsa884x_dlkm.ko +LOCAL_MODULE_KBUILD_NAME := asoc/codecs/wsa884x/wsa884x_dlkm.ko LOCAL_MODULE_TAGS := optional LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) @@ -1 +1 @@ -obj-y := dsp/ ipc/ soc/ asoc/ asoc/codecs/ asoc/codecs/lpass-cdc/ asoc/codecs/wsa883x/ asoc/codecs/wcd938x/ +obj-y := dsp/ ipc/ soc/ asoc/ asoc/codecs/ asoc/codecs/lpass-cdc/ asoc/codecs/wsa884x/ asoc/codecs/wcd938x/ diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild index 23a8a529..2813331a 100644 --- a/asoc/codecs/Kbuild +++ b/asoc/codecs/Kbuild @@ -257,7 +257,6 @@ ifeq ($(KERNEL_BUILD), 1) obj-y += wcd938x/ obj-y += bolero/ obj-y += lpass-cdc/ - obj-y += wsa883x/ obj-y += wsa884x/ obj-y += rouleur/ endif diff --git a/asoc/codecs/wsa884x/Kbuild b/asoc/codecs/wsa884x/Kbuild index 5efcd27a..2c694e72 100644 --- a/asoc/codecs/wsa884x/Kbuild +++ b/asoc/codecs/wsa884x/Kbuild @@ -22,6 +22,10 @@ ifeq ($(KERNEL_BUILD), 0) include $(AUDIO_ROOT)/config/waipioauto.conf INCS += -include $(AUDIO_ROOT)/config/waipioautoconf.h endif + ifeq ($(CONFIG_ARCH_KALAMA), y) + include $(AUDIO_ROOT)/config/kalamaauto.conf + INCS += -include $(AUDIO_ROOT)/config/kalamaautoconf.h + endif ifeq ($(CONFIG_ARCH_LITO), y) include $(AUDIO_ROOT)/config/litoauto.conf INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h diff --git a/audio_kernel_product_board.mk b/audio_kernel_product_board.mk index 21f5d888..71b34b52 100644 --- a/audio_kernel_product_board.mk +++ b/audio_kernel_product_board.mk @@ -25,6 +25,6 @@ PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/q6_notifier_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)/wsa883x_dlkm.ko \ + $(KERNEL_MODULES_OUT)/wsa884x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd938x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd938x_slave_dlkm.ko diff --git a/audio_kernel_vendor_board.mk b/audio_kernel_vendor_board.mk index 023b9b78..3dde5ef6 100644 --- a/audio_kernel_vendor_board.mk +++ b/audio_kernel_vendor_board.mk @@ -38,7 +38,7 @@ BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/q6_notifier_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)/wsa883x_dlkm.ko \ + $(KERNEL_MODULES_OUT)/wsa884x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd938x_dlkm.ko \ $(KERNEL_MODULES_OUT)/wcd938x_slave_dlkm.ko endif diff --git a/config/kalamaauto.conf b/config/kalamaauto.conf index 96adc232..bd803941 100644 --- a/config/kalamaauto.conf +++ b/config/kalamaauto.conf @@ -16,7 +16,7 @@ export CONFIG_SOUNDWIRE=m export CONFIG_SOUNDWIRE_MSTR_CTRL=m export CONFIG_WCD9XXX_CODEC_CORE_V2=m export CONFIG_MSM_CDC_PINCTRL=m -export CONFIG_SND_SOC_WSA883X=m +export CONFIG_SND_SOC_WSA884X=m export CONFIG_SND_SOC_LPASS_CDC=m export CONFIG_SND_SOC_WCD_IRQ=m export CONFIG_LPASS_CDC_WSA2_MACRO=m diff --git a/config/kalamaautoconf.h b/config/kalamaautoconf.h index 13bcc384..5d114f60 100644 --- a/config/kalamaautoconf.h +++ b/config/kalamaautoconf.h @@ -23,7 +23,7 @@ #define CONFIG_SWRM_VER_1P7 1 #define CONFIG_WCD9XXX_CODEC_CORE_V2 1 #define CONFIG_MSM_CDC_PINCTRL 1 -#define CONFIG_SND_SOC_WSA883X 1 +#define CONFIG_SND_SOC_WSA884X 1 #define CONFIG_SND_SOC_LPASS_CDC 1 #define CONFIG_SND_SOC_WCD_IRQ 1 #define CONFIG_LPASS_CDC_WSA2_MACRO 1 |