Merge "audio: Add control to set USB AFE port service level"
diff --git a/Android.mk b/Android.mk
index a287fd7..ee4ba35 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,18 +1,18 @@
# Android makefile for audio kernel modules
MY_LOCAL_PATH := $(call my-dir)
-UAPI_OUT := $(OUT)/obj/vendor/qcom/opensource/audio-kernel/include
+UAPI_OUT := $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/include
-ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm845 sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm845 sdm710 qcs605),true)
$(shell mkdir -p $(UAPI_OUT)/linux;)
$(shell mkdir -p $(UAPI_OUT)/sound;)
-$(shell rm -rf $(OUT)/obj/vendor/qcom/opensource/audio-kernel/ipc/Module.symvers)
-$(shell rm -rf $(OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers)
-$(shell rm -rf $(OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/codecs/Module.symvers)
-$(shell rm -rf $(OUT)/obj/vendor/qcom/opensource/audio-kernel/soc/Module.symvers)
-$(shell rm -rf $(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/Module.symvers)
-$(shell rm -rf $(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/Module.symvers)
-$(shell rm -rf $(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd934x/Module.symvers)
+$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/ipc/Module.symvers)
+$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers)
+$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/codecs/Module.symvers)
+$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/soc/Module.symvers)
+$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/Module.symvers)
+$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/Module.symvers)
+$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd934x/Module.symvers)
include $(MY_LOCAL_PATH)/include/uapi/Android.mk
include $(MY_LOCAL_PATH)/ipc/Android.mk
@@ -24,9 +24,9 @@
include $(MY_LOCAL_PATH)/asoc/codecs/wcd934x/Android.mk
endif
-ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm670 qcs605),true)
-$(shell rm -rf $(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/sdm660_cdc/Module.symvers)
-$(shell rm -rf $(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/msm_sdw/Module.symvers)
+ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm710 qcs605),true)
+$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/sdm660_cdc/Module.symvers)
+$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/msm_sdw/Module.symvers)
include $(MY_LOCAL_PATH)/asoc/codecs/sdm660_cdc/Android.mk
include $(MY_LOCAL_PATH)/asoc/codecs/msm_sdw/Android.mk
endif
diff --git a/Makefile b/Makefile
index 2848799..7fcf473 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
export
endif
ifeq ($(CONFIG_ARCH_SDM670), y)
-include $(srctree)/techpack/audio/config/sdm670auto_static.conf
+include $(srctree)/techpack/audio/config/sdm710auto_static.conf
export
endif
ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)
@@ -28,7 +28,7 @@
endif
ifeq ($(CONFIG_ARCH_SDM670), y)
LINUXINCLUDE += \
- -include $(srctree)/techpack/audio/config/sdm670autoconf.h
+ -include $(srctree)/techpack/audio/config/sdm710autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)
LINUXINCLUDE += \
diff --git a/asoc/Android.mk b/asoc/Android.mk
index 867379b..324be04 100644
--- a/asoc/Android.mk
+++ b/asoc/Android.mk
@@ -8,8 +8,8 @@
AUDIO_SELECT := CONFIG_SND_SOC_SDM845=m
endif
-ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)
-TARGET := sdm670
+ifeq ($(call is-board-platform-in-list,sdm710 qcs605),true)
+TARGET := sdm710
AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
endif
@@ -21,7 +21,7 @@
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
-ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm845 sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm845 sdm710 qcs605),true)
LOCAL_PATH := $(call my-dir)
@@ -56,7 +56,7 @@
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/AndroidKernelModule.mk
###########################################################
-ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm710 qcs605),true)
include $(CLEAR_VARS)
LOCAL_MODULE := $(AUDIO_CHIPSET)_cpe_lsm.ko
LOCAL_MODULE_KBUILD_NAME := cpe_lsm_dlkm.ko
diff --git a/asoc/Kbuild b/asoc/Kbuild
index aba7ceb..3a29db1 100644
--- a/asoc/Kbuild
+++ b/asoc/Kbuild
@@ -21,9 +21,9 @@
INCS += -include $(AUDIO_ROOT)/config/sdm845autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM670), y)
- include $(AUDIO_ROOT)/config/sdm670auto.conf
+ include $(AUDIO_ROOT)/config/sdm710auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sdm710autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM450), y)
include $(AUDIO_ROOT)/config/sdm450auto.conf
diff --git a/asoc/codecs/Android.mk b/asoc/codecs/Android.mk
index 22c394d..236c9e3 100644
--- a/asoc/codecs/Android.mk
+++ b/asoc/codecs/Android.mk
@@ -7,7 +7,7 @@
AUDIO_SELECT := CONFIG_SND_SOC_SDM845=m
endif
-ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,sdm710 qcs605),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
endif
@@ -18,7 +18,7 @@
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
-ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm845 sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm845 sdm710 qcs605),true)
LOCAL_PATH := $(call my-dir)
@@ -61,7 +61,7 @@
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/AndroidKernelModule.mk
###########################################################
-ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm710 qcs605),true)
include $(CLEAR_VARS)
LOCAL_MODULE := $(AUDIO_CHIPSET)_wcd_cpe.ko
LOCAL_MODULE_KBUILD_NAME := wcd_cpe_dlkm.ko
@@ -71,7 +71,7 @@
include $(DLKM_DIR)/AndroidKernelModule.mk
endif
###########################################################
-ifeq ($(call is-board-platform-in-list, sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list, sdm710 qcs605),true)
include $(CLEAR_VARS)
LOCAL_MODULE := $(AUDIO_CHIPSET)_wcd_spi.ko
LOCAL_MODULE_KBUILD_NAME := wcd_spi_dlkm.ko
@@ -81,7 +81,7 @@
include $(DLKM_DIR)/AndroidKernelModule.mk
endif
###########################################################
-ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm710 qcs605),true)
include $(CLEAR_VARS)
LOCAL_MODULE := $(AUDIO_CHIPSET)_wcd9335.ko
LOCAL_MODULE_KBUILD_NAME := wcd9335_dlkm.ko
diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild
index b2d32fc..5ea58ba 100644
--- a/asoc/codecs/Kbuild
+++ b/asoc/codecs/Kbuild
@@ -20,9 +20,9 @@
INCS += -include $(AUDIO_ROOT)/config/sdm845autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM670), y)
- include $(AUDIO_ROOT)/config/sdm670auto.conf
+ include $(AUDIO_ROOT)/config/sdm710auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sdm710autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM450), y)
include $(AUDIO_ROOT)/config/sdm450auto.conf
diff --git a/asoc/codecs/msm_sdw/Android.mk b/asoc/codecs/msm_sdw/Android.mk
index dc6cd27..cd99a43 100644
--- a/asoc/codecs/msm_sdw/Android.mk
+++ b/asoc/codecs/msm_sdw/Android.mk
@@ -4,7 +4,7 @@
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
-ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,sdm710 qcs605),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
LOCAL_PATH := $(call my-dir)
diff --git a/asoc/codecs/msm_sdw/Kbuild b/asoc/codecs/msm_sdw/Kbuild
index 6d0ed5f..84a651f 100644
--- a/asoc/codecs/msm_sdw/Kbuild
+++ b/asoc/codecs/msm_sdw/Kbuild
@@ -21,9 +21,9 @@
INCS += -include $(AUDIO_ROOT)/config/sdm845autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM670), y)
- include $(AUDIO_ROOT)/config/sdm670auto.conf
+ include $(AUDIO_ROOT)/config/sdm710auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sdm710autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM450), y)
include $(AUDIO_ROOT)/config/sdm450auto.conf
diff --git a/asoc/codecs/sdm660_cdc/Android.mk b/asoc/codecs/sdm660_cdc/Android.mk
index 7447578..606a720 100644
--- a/asoc/codecs/sdm660_cdc/Android.mk
+++ b/asoc/codecs/sdm660_cdc/Android.mk
@@ -4,7 +4,7 @@
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
-ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm710 qcs605),true)
LOCAL_PATH := $(call my-dir)
diff --git a/asoc/codecs/sdm660_cdc/Kbuild b/asoc/codecs/sdm660_cdc/Kbuild
index e5534f0..507c663 100644
--- a/asoc/codecs/sdm660_cdc/Kbuild
+++ b/asoc/codecs/sdm660_cdc/Kbuild
@@ -21,9 +21,9 @@
INCS += -include $(AUDIO_ROOT)/config/sdm845autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM670), y)
- include $(AUDIO_ROOT)/config/sdm670auto.conf
+ include $(AUDIO_ROOT)/config/sdm710auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sdm710autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM450), y)
include $(AUDIO_ROOT)/config/sdm450auto.conf
diff --git a/asoc/codecs/sdm660_cdc/msm-analog-cdc.c b/asoc/codecs/sdm660_cdc/msm-analog-cdc.c
index 86f9db7..0e3851b 100644
--- a/asoc/codecs/sdm660_cdc/msm-analog-cdc.c
+++ b/asoc/codecs/sdm660_cdc/msm-analog-cdc.c
@@ -2777,6 +2777,11 @@
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
+ /*
+ * Add 2ms sleep to fix PA wrong state issue
+ * during back2back hph disable-enable
+ */
+ usleep_range(2000, 2100);
if (get_codec_version(sdm660_cdc) > CAJON)
snd_soc_update_bits(codec,
MSM89XX_PMIC_ANALOG_RX_HPH_CNP_EN,
@@ -2890,6 +2895,11 @@
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
+ /*
+ * Add 2ms sleep to fix PA wrong state issue
+ * during back2back hph disable-enable
+ */
+ usleep_range(2000, 2100);
if (sdm660_cdc->hph_mode == HD2_MODE)
msm_anlg_cdc_dig_notifier_call(codec,
DIG_CDC_EVENT_PRE_RX2_INT_ON);
diff --git a/asoc/codecs/wcd934x/Android.mk b/asoc/codecs/wcd934x/Android.mk
index 9cb8ec2..5edfa27 100644
--- a/asoc/codecs/wcd934x/Android.mk
+++ b/asoc/codecs/wcd934x/Android.mk
@@ -7,13 +7,13 @@
AUDIO_SELECT := CONFIG_SND_SOC_SDM845=m
endif
-ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,sdm710 qcs605),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
endif
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
-ifeq ($(call is-board-platform-in-list,sdm845 sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,sdm845 sdm710 qcs605),true)
LOCAL_PATH := $(call my-dir)
diff --git a/asoc/codecs/wcd934x/Kbuild b/asoc/codecs/wcd934x/Kbuild
index e46e39d..25785d7 100644
--- a/asoc/codecs/wcd934x/Kbuild
+++ b/asoc/codecs/wcd934x/Kbuild
@@ -22,9 +22,9 @@
INCS += -include $(AUDIO_ROOT)/config/sdm845autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM670), y)
- include $(AUDIO_ROOT)/config/sdm670auto.conf
+ include $(AUDIO_ROOT)/config/sdm710auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sdm710autoconf.h
endif
endif
diff --git a/asoc/codecs/wsa881x-analog.c b/asoc/codecs/wsa881x-analog.c
index d4575d0..efb7350 100644
--- a/asoc/codecs/wsa881x-analog.c
+++ b/asoc/codecs/wsa881x-analog.c
@@ -233,7 +233,7 @@
struct i2c_msg *msg;
int ret = 0;
u8 reg_addr = 0;
- u8 dest[5];
+ u8 dest[5] = {0};
wsa881x_index = get_i2c_wsa881x_device_index(reg);
if (wsa881x_index < 0) {
diff --git a/config/sdm670auto.conf b/config/sdm710auto.conf
similarity index 100%
rename from config/sdm670auto.conf
rename to config/sdm710auto.conf
diff --git a/config/sdm670auto_static.conf b/config/sdm710auto_static.conf
similarity index 100%
rename from config/sdm670auto_static.conf
rename to config/sdm710auto_static.conf
diff --git a/config/sdm670autoconf.h b/config/sdm710autoconf.h
similarity index 100%
rename from config/sdm670autoconf.h
rename to config/sdm710autoconf.h
diff --git a/dsp/Android.mk b/dsp/Android.mk
index b92fd0a..e5f8ec3 100644
--- a/dsp/Android.mk
+++ b/dsp/Android.mk
@@ -7,7 +7,7 @@
AUDIO_SELECT := CONFIG_SND_SOC_SDM845=m
endif
-ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,sdm710 qcs605),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
endif
@@ -17,7 +17,7 @@
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
-ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm845 sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm845 sdm710 qcs605),true)
LOCAL_PATH := $(call my-dir)
@@ -76,7 +76,7 @@
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/AndroidKernelModule.mk
###########################################################
-ifeq ($(call is-board-platform-in-list, sdm845 sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list, sdm845 sdm710 qcs605),true)
include $(CLEAR_VARS)
LOCAL_MODULE := $(AUDIO_CHIPSET)_q6_pdr.ko
LOCAL_MODULE_KBUILD_NAME := q6_pdr_dlkm.ko
diff --git a/dsp/Kbuild b/dsp/Kbuild
index e330aa1..7f71af0 100644
--- a/dsp/Kbuild
+++ b/dsp/Kbuild
@@ -20,9 +20,9 @@
INCS += -include $(AUDIO_ROOT)/config/sdm845autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM670), y)
- include $(AUDIO_ROOT)/config/sdm670auto.conf
+ include $(AUDIO_ROOT)/config/sdm710auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sdm710autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM450), y)
include $(AUDIO_ROOT)/config/sdm450auto.conf
diff --git a/dsp/codecs/Android.mk b/dsp/codecs/Android.mk
index 5e6170a..5dab82b 100644
--- a/dsp/codecs/Android.mk
+++ b/dsp/codecs/Android.mk
@@ -7,7 +7,7 @@
AUDIO_SELECT := CONFIG_SND_SOC_SDM845=m
endif
-ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,sdm710 qcs605),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
endif
@@ -17,7 +17,7 @@
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
-ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm845 sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm845 sdm710 qcs605),true)
LOCAL_PATH := $(call my-dir)
diff --git a/dsp/codecs/Kbuild b/dsp/codecs/Kbuild
index ff6f45d..4af0524 100644
--- a/dsp/codecs/Kbuild
+++ b/dsp/codecs/Kbuild
@@ -21,9 +21,9 @@
endif
ifeq ($(CONFIG_ARCH_SDM670), y)
- include $(AUDIO_ROOT)/config/sdm670auto.conf
+ include $(AUDIO_ROOT)/config/sdm710auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sdm710autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM450), y)
include $(AUDIO_ROOT)/config/sdm450auto.conf
diff --git a/dsp/rtac.c b/dsp/rtac.c
index 43c69cc..1015be4 100644
--- a/dsp/rtac.c
+++ b/dsp/rtac.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -1944,17 +1944,26 @@
goto nomem;
}
- return misc_register(&rtac_misc);
+ if (misc_register(&rtac_misc) != 0) {
+ kzfree(rtac_adm_buffer);
+ kzfree(rtac_asm_buffer);
+ kzfree(rtac_afe_buffer);
+ kzfree(rtac_voice_buffer);
+ goto nomem;
+ }
+
+ return 0;
nomem:
return -ENOMEM;
}
void rtac_exit(void)
{
+ misc_deregister(&rtac_misc);
kzfree(rtac_adm_buffer);
kzfree(rtac_asm_buffer);
kzfree(rtac_afe_buffer);
- misc_deregister(&rtac_misc);
+ kzfree(rtac_voice_buffer);
}
MODULE_DESCRIPTION("SoC QDSP6v2 Real-Time Audio Calibration driver");
diff --git a/ipc/Android.mk b/ipc/Android.mk
index f6fbf5f..5d17021 100644
--- a/ipc/Android.mk
+++ b/ipc/Android.mk
@@ -7,7 +7,7 @@
AUDIO_SELECT := CONFIG_SND_SOC_SDM845=m
endif
-ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,sdm710 qcs605),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
endif
@@ -17,7 +17,7 @@
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
-ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm845 sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm845 sdm710 qcs605),true)
LOCAL_PATH := $(call my-dir)
@@ -52,7 +52,7 @@
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/AndroidKernelModule.mk
###########################################################
-ifeq ($(call is-board-platform-in-list,msm8953 sdm845 sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,msm8953 sdm845 sdm710 qcs605),true)
include $(CLEAR_VARS)
LOCAL_MODULE := $(AUDIO_CHIPSET)_wglink.ko
LOCAL_MODULE_KBUILD_NAME := wglink_dlkm.ko
diff --git a/ipc/Kbuild b/ipc/Kbuild
index 86db0b4..860119f 100644
--- a/ipc/Kbuild
+++ b/ipc/Kbuild
@@ -32,9 +32,9 @@
INCS += -include $(AUDIO_ROOT)/config/sdm845autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM670), y)
- include $(AUDIO_ROOT)/config/sdm670auto.conf
+ include $(AUDIO_ROOT)/config/sdm710auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sdm710autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM450), y)
include $(AUDIO_ROOT)/config/sdm450auto.conf
diff --git a/soc/Android.mk b/soc/Android.mk
index e488536..85ae002 100644
--- a/soc/Android.mk
+++ b/soc/Android.mk
@@ -7,7 +7,7 @@
AUDIO_SELECT := CONFIG_SND_SOC_SDM845=m
endif
-ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,sdm710 qcs605),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
endif
@@ -17,7 +17,7 @@
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
-ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm845 sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm845 sdm710 qcs605),true)
LOCAL_PATH := $(call my-dir)
@@ -44,7 +44,7 @@
KBUILD_OPTIONS += $(AUDIO_SELECT)
###########################################################
-ifeq ($(call is-board-platform-in-list, sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list, sdm710 qcs605),true)
include $(CLEAR_VARS)
LOCAL_MODULE := $(AUDIO_CHIPSET)_pinctrl_lpi.ko
LOCAL_MODULE_KBUILD_NAME := pinctrl_lpi_dlkm.ko
diff --git a/soc/Kbuild b/soc/Kbuild
index a233937..9be24f0 100644
--- a/soc/Kbuild
+++ b/soc/Kbuild
@@ -20,9 +20,9 @@
INCS += -include $(AUDIO_ROOT)/config/sdm845autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM670), y)
- include $(AUDIO_ROOT)/config/sdm670auto.conf
+ include $(AUDIO_ROOT)/config/sdm710auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sdm710autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM450), y)
include $(AUDIO_ROOT)/config/sdm450auto.conf