audio-kernel: update chipset name
Update all audio drivers to use updated chipset name in
files, functions, architecture specific configurations
and the device tree compatible strings.
Change-Id: I507948866213ddb8806edea71a57c1f29ce7e71b
Signed-off-by: Xiaoyu Ye <benyxy@codeaurora.org>
diff --git a/Makefile b/Makefile
index 69f3795..fbf0ee1 100644
--- a/Makefile
+++ b/Makefile
@@ -12,11 +12,11 @@
export
endif
ifeq ($(CONFIG_ARCH_SM8150), y)
-include $(srctree)/techpack/audio/config/sdm855auto.conf
+include $(srctree)/techpack/audio/config/sm8150auto.conf
export
endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
-include $(srctree)/techpack/audio/config/sdm855auto.conf
+include $(srctree)/techpack/audio/config/sm8150auto.conf
export
endif
@@ -44,11 +44,11 @@
endif
ifeq ($(CONFIG_ARCH_SM8150), y)
LINUXINCLUDE += \
- -include $(srctree)/techpack/audio/config/sdm855autoconf.h
+ -include $(srctree)/techpack/audio/config/sm8150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
LINUXINCLUDE += \
- -include $(srctree)/techpack/audio/config/sdm855autoconf.h
+ -include $(srctree)/techpack/audio/config/sm8150autoconf.h
endif
obj-y += asoc/
diff --git a/asoc/Android.mk b/asoc/Android.mk
index 6154917..cb2ce0c 100644
--- a/asoc/Android.mk
+++ b/asoc/Android.mk
@@ -15,7 +15,7 @@
ifeq ($(call is-board-platform,msmnile),true)
TARGET := msmnile
-AUDIO_SELECT := CONFIG_SND_SOC_SDM855=m
+AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif
AUDIO_CHIPSET := audio
diff --git a/asoc/Kbuild b/asoc/Kbuild
index 453452c..aea5662 100644
--- a/asoc/Kbuild
+++ b/asoc/Kbuild
@@ -31,14 +31,14 @@
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SM8150), y)
- include $(AUDIO_ROOT)/config/sdm855auto.conf
+ include $(AUDIO_ROOT)/config/sm8150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
- include $(AUDIO_ROOT)/config/sdm855auto.conf
+ include $(AUDIO_ROOT)/config/sm8150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
endif
@@ -90,9 +90,9 @@
MACHINE_OBJS += sdm845.o
endif
-# for SDM855 sound card driver
-ifdef CONFIG_SND_SOC_SDM855
- MACHINE_OBJS += sdm855.o
+# for SM8150 sound card driver
+ifdef CONFIG_SND_SOC_SM8150
+ MACHINE_OBJS += sm8150.o
endif
ifdef CONFIG_SND_SOC_CPE
@@ -183,7 +183,7 @@
obj-$(CONFIG_SND_SOC_MACHINE_SDM845) += machine_dlkm.o
machine_dlkm-y := $(MACHINE_OBJS)
-obj-$(CONFIG_SND_SOC_SDM855) += machine_dlkm.o
+obj-$(CONFIG_SND_SOC_SM8150) += machine_dlkm.o
machine_dlkm-y := $(MACHINE_OBJS)
obj-$(CONFIG_SND_SOC_EXT_CODEC) += machine_dlkm.o
diff --git a/asoc/codecs/Android.mk b/asoc/codecs/Android.mk
index 152f617..803e480 100644
--- a/asoc/codecs/Android.mk
+++ b/asoc/codecs/Android.mk
@@ -12,7 +12,7 @@
endif
ifeq ($(call is-board-platform,msmnile),true)
-AUDIO_SELECT := CONFIG_SND_SOC_SDM855=m
+AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif
AUDIO_CHIPSET := audio
diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild
index 412ec68..9f3cfce 100644
--- a/asoc/codecs/Kbuild
+++ b/asoc/codecs/Kbuild
@@ -30,14 +30,14 @@
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SM8150), y)
- include $(AUDIO_ROOT)/config/sdm855auto.conf
+ include $(AUDIO_ROOT)/config/sm8150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
- include $(AUDIO_ROOT)/config/sdm855auto.conf
+ include $(AUDIO_ROOT)/config/sm8150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
endif
diff --git a/asoc/codecs/aqt1000/Kbuild b/asoc/codecs/aqt1000/Kbuild
index 9484714..6523ce6 100644
--- a/asoc/codecs/aqt1000/Kbuild
+++ b/asoc/codecs/aqt1000/Kbuild
@@ -24,15 +24,15 @@
endif
ifeq ($(CONFIG_ARCH_SM8150), y)
- include $(AUDIO_ROOT)/config/sdm855auto.conf
+ include $(AUDIO_ROOT)/config/sm8150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
- include $(AUDIO_ROOT)/config/sdm855auto.conf
+ include $(AUDIO_ROOT)/config/sm8150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
endif
diff --git a/asoc/codecs/wcd934x/Android.mk b/asoc/codecs/wcd934x/Android.mk
index 200f6c3..313d513 100644
--- a/asoc/codecs/wcd934x/Android.mk
+++ b/asoc/codecs/wcd934x/Android.mk
@@ -8,7 +8,7 @@
endif
ifeq ($(call is-board-platform,msmnile),true)
-AUDIO_SELECT := CONFIG_SND_SOC_SDM855=m
+AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif
ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605),true)
diff --git a/asoc/codecs/wcd934x/Kbuild b/asoc/codecs/wcd934x/Kbuild
index ee83206..256f518 100644
--- a/asoc/codecs/wcd934x/Kbuild
+++ b/asoc/codecs/wcd934x/Kbuild
@@ -32,14 +32,14 @@
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SM8150), y)
- include $(AUDIO_ROOT)/config/sdm855auto.conf
+ include $(AUDIO_ROOT)/config/sm8150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
- include $(AUDIO_ROOT)/config/sdm855auto.conf
+ include $(AUDIO_ROOT)/config/sm8150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
endif
diff --git a/asoc/codecs/wcd9360/Android.mk b/asoc/codecs/wcd9360/Android.mk
index bf65cff..bee0364 100644
--- a/asoc/codecs/wcd9360/Android.mk
+++ b/asoc/codecs/wcd9360/Android.mk
@@ -4,7 +4,7 @@
# Check if this driver needs be built for current target
ifeq ($(call is-board-platform,msmnile),true)
-AUDIO_SELECT := CONFIG_SND_SOC_SDM855=m
+AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif
AUDIO_CHIPSET := audio
diff --git a/asoc/codecs/wcd9360/Kbuild b/asoc/codecs/wcd9360/Kbuild
index d9053a3..6bba0c5 100644
--- a/asoc/codecs/wcd9360/Kbuild
+++ b/asoc/codecs/wcd9360/Kbuild
@@ -17,15 +17,15 @@
ifeq ($(KERNEL_BUILD), 0)
ifeq ($(CONFIG_ARCH_SM8150), y)
- include $(AUDIO_ROOT)/config/sdm855auto.conf
+ include $(AUDIO_ROOT)/config/sm8150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
- include $(AUDIO_ROOT)/config/sdm855auto.conf
+ include $(AUDIO_ROOT)/config/sm8150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
endif
diff --git a/asoc/sdm855.c b/asoc/sm8150.c
similarity index 98%
rename from asoc/sdm855.c
rename to asoc/sm8150.c
index e45bbb4..e561ad5 100644
--- a/asoc/sdm855.c
+++ b/asoc/sm8150.c
@@ -40,9 +40,9 @@
#include "codecs/wsa881x.h"
#include "codecs/wcd-mbhc-v2.h"
-#define DRV_NAME "sdm855-asoc-snd"
+#define DRV_NAME "sm8150-asoc-snd"
-#define __CHIPSET__ "SDM855 "
+#define __CHIPSET__ "SM8150 "
#define MSM_DAILINK_NAME(name) (__CHIPSET__#name)
#define DEV_NAME_STR_LEN 32
@@ -3740,7 +3740,7 @@
return ret;
}
-static int sdm855_notifier_service_cb(struct notifier_block *this,
+static int sm8150_notifier_service_cb(struct notifier_block *this,
unsigned long opcode, void *ptr)
{
int ret;
@@ -3798,7 +3798,7 @@
}
static struct notifier_block service_nb = {
- .notifier_call = sdm855_notifier_service_cb,
+ .notifier_call = sm8150_notifier_service_cb,
.priority = -INT_MAX,
};
@@ -4509,7 +4509,7 @@
return 0;
}
-static int sdm855_tdm_snd_hw_params(struct snd_pcm_substream *substream,
+static int sm8150_tdm_snd_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -4625,7 +4625,7 @@
return ret;
}
-static int sdm855_tdm_snd_startup(struct snd_pcm_substream *substream)
+static int sm8150_tdm_snd_startup(struct snd_pcm_substream *substream)
{
int ret = 0;
struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -4646,7 +4646,7 @@
return ret;
}
-static void sdm855_tdm_snd_shutdown(struct snd_pcm_substream *substream)
+static void sm8150_tdm_snd_shutdown(struct snd_pcm_substream *substream)
{
int ret = 0;
struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -4665,10 +4665,10 @@
}
}
-static struct snd_soc_ops sdm855_tdm_be_ops = {
- .hw_params = sdm855_tdm_snd_hw_params,
- .startup = sdm855_tdm_snd_startup,
- .shutdown = sdm855_tdm_snd_shutdown
+static struct snd_soc_ops sm8150_tdm_be_ops = {
+ .hw_params = sm8150_tdm_snd_hw_params,
+ .startup = sm8150_tdm_snd_startup,
+ .shutdown = sm8150_tdm_snd_shutdown
};
static int msm_fe_qos_prepare(struct snd_pcm_substream *substream)
@@ -5630,7 +5630,7 @@
.dpcm_playback = 1,
.id = MSM_BACKEND_DAI_PRI_TDM_RX_0,
.be_hw_params_fixup = msm_be_hw_params_fixup,
- .ops = &sdm855_tdm_be_ops,
+ .ops = &sm8150_tdm_be_ops,
.ignore_suspend = 1,
.ignore_pmdown_time = 1,
},
@@ -5645,7 +5645,7 @@
.dpcm_capture = 1,
.id = MSM_BACKEND_DAI_PRI_TDM_TX_0,
.be_hw_params_fixup = msm_be_hw_params_fixup,
- .ops = &sdm855_tdm_be_ops,
+ .ops = &sm8150_tdm_be_ops,
.ignore_suspend = 1,
},
{
@@ -5659,7 +5659,7 @@
.dpcm_playback = 1,
.id = MSM_BACKEND_DAI_SEC_TDM_RX_0,
.be_hw_params_fixup = msm_be_hw_params_fixup,
- .ops = &sdm855_tdm_be_ops,
+ .ops = &sm8150_tdm_be_ops,
.ignore_suspend = 1,
.ignore_pmdown_time = 1,
},
@@ -5674,7 +5674,7 @@
.dpcm_capture = 1,
.id = MSM_BACKEND_DAI_SEC_TDM_TX_0,
.be_hw_params_fixup = msm_be_hw_params_fixup,
- .ops = &sdm855_tdm_be_ops,
+ .ops = &sm8150_tdm_be_ops,
.ignore_suspend = 1,
},
{
@@ -5688,7 +5688,7 @@
.dpcm_playback = 1,
.id = MSM_BACKEND_DAI_TERT_TDM_RX_0,
.be_hw_params_fixup = msm_be_hw_params_fixup,
- .ops = &sdm855_tdm_be_ops,
+ .ops = &sm8150_tdm_be_ops,
.ignore_suspend = 1,
.ignore_pmdown_time = 1,
},
@@ -5703,7 +5703,7 @@
.dpcm_capture = 1,
.id = MSM_BACKEND_DAI_TERT_TDM_TX_0,
.be_hw_params_fixup = msm_be_hw_params_fixup,
- .ops = &sdm855_tdm_be_ops,
+ .ops = &sm8150_tdm_be_ops,
.ignore_suspend = 1,
},
{
@@ -5717,7 +5717,7 @@
.dpcm_playback = 1,
.id = MSM_BACKEND_DAI_QUAT_TDM_RX_0,
.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,
- .ops = &sdm855_tdm_be_ops,
+ .ops = &sm8150_tdm_be_ops,
.ignore_suspend = 1,
.ignore_pmdown_time = 1,
},
@@ -5732,7 +5732,7 @@
.dpcm_capture = 1,
.id = MSM_BACKEND_DAI_QUAT_TDM_TX_0,
.be_hw_params_fixup = msm_be_hw_params_fixup,
- .ops = &sdm855_tdm_be_ops,
+ .ops = &sm8150_tdm_be_ops,
.ignore_suspend = 1,
},
};
@@ -6532,11 +6532,11 @@
}
struct snd_soc_card snd_soc_card_pahu_msm = {
- .name = "sdm855-pahu-snd-card",
+ .name = "sm8150-pahu-snd-card",
};
struct snd_soc_card snd_soc_card_tavil_msm = {
- .name = "sdm855-tavil-snd-card",
+ .name = "sm8150-tavil-snd-card",
.late_probe = msm_snd_card_tavil_late_probe,
};
@@ -6742,10 +6742,10 @@
ARRAY_SIZE(msm_stub_be_dai_links)];
struct snd_soc_card snd_soc_card_stub_msm = {
- .name = "sdm855-stub-snd-card",
+ .name = "sm8150-stub-snd-card",
};
-static const struct of_device_id sdm855_asoc_machine_of_match[] = {
+static const struct of_device_id sm8150_asoc_machine_of_match[] = {
{ .compatible = "qcom,sm8150-asoc-snd-pahu",
.data = "pahu_codec"},
{ .compatible = "qcom,sm8150-asoc-snd-tavil",
@@ -6763,7 +6763,7 @@
int total_links;
const struct of_device_id *match;
- match = of_match_node(sdm855_asoc_machine_of_match, dev->of_node);
+ match = of_match_node(sm8150_asoc_machine_of_match, dev->of_node);
if (!match) {
dev_err(dev, "%s: No DT match found for sound card\n",
__func__);
@@ -7327,7 +7327,7 @@
msm_i2s_auxpcm_init(pdev);
is_initial_boot = true;
- ret = audio_notifier_register("sdm855", AUDIO_NOTIFIER_ADSP_DOMAIN,
+ ret = audio_notifier_register("sm8150", AUDIO_NOTIFIER_ADSP_DOMAIN,
&service_nb);
if (ret < 0)
pr_err("%s: Audio notifier register failed ret = %d\n",
@@ -7342,26 +7342,26 @@
static int msm_asoc_machine_remove(struct platform_device *pdev)
{
- audio_notifier_deregister("sdm855");
+ audio_notifier_deregister("sm8150");
msm_i2s_auxpcm_deinit();
msm_release_pinctrl(pdev);
return 0;
}
-static struct platform_driver sdm855_asoc_machine_driver = {
+static struct platform_driver sm8150_asoc_machine_driver = {
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
.pm = &snd_soc_pm_ops,
- .of_match_table = sdm855_asoc_machine_of_match,
+ .of_match_table = sm8150_asoc_machine_of_match,
},
.probe = msm_asoc_machine_probe,
.remove = msm_asoc_machine_remove,
};
-module_platform_driver(sdm855_asoc_machine_driver);
+module_platform_driver(sm8150_asoc_machine_driver);
MODULE_DESCRIPTION("ALSA SoC msm");
MODULE_LICENSE("GPL v2");
MODULE_ALIAS("platform:" DRV_NAME);
-MODULE_DEVICE_TABLE(of, sdm855_asoc_machine_of_match);
+MODULE_DEVICE_TABLE(of, sm8150_asoc_machine_of_match);
diff --git a/config/sdm855auto.conf b/config/sm8150auto.conf
similarity index 97%
rename from config/sdm855auto.conf
rename to config/sm8150auto.conf
index cfddf95..f00155f 100644
--- a/config/sdm855auto.conf
+++ b/config/sm8150auto.conf
@@ -23,7 +23,7 @@
CONFIG_MSM_QDSP6_NOTIFIER=m
CONFIG_SND_SOC_MSM_HOSTLESS_PCM=m
CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m
-CONFIG_SND_SOC_SDM855=m
+CONFIG_SND_SOC_SM8150=m
CONFIG_MSM_GLINK_SPI_XPRT=m
CONFIG_WCD_DSP_GLINK=m
CONFIG_SOUNDWIRE=m
diff --git a/config/sdm855autoconf.h b/config/sm8150autoconf.h
similarity index 98%
rename from config/sdm855autoconf.h
rename to config/sm8150autoconf.h
index 9906d4b..fbaca24 100644
--- a/config/sdm855autoconf.h
+++ b/config/sm8150autoconf.h
@@ -34,7 +34,7 @@
#define CONFIG_MSM_QDSP6_PDR 1
#define CONFIG_MSM_QDSP6_NOTIFIER 1
#define CONFIG_SND_SOC_MSM_HOSTLESS_PCM 1
-#define CONFIG_SND_SOC_SDM855 1
+#define CONFIG_SND_SOC_SM8150 1
#define CONFIG_MSM_GLINK_SPI_XPRT 1
#define CONFIG_WCD_DSP_GLINK 1
#define CONFIG_SOUNDWIRE 1
diff --git a/dsp/Android.mk b/dsp/Android.mk
index cad30c8..281ed87 100644
--- a/dsp/Android.mk
+++ b/dsp/Android.mk
@@ -12,7 +12,7 @@
endif
ifeq ($(call is-board-platform,msmnile),true)
-AUDIO_SELECT := CONFIG_SND_SOC_SDM855=m
+AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif
AUDIO_CHIPSET := audio
diff --git a/dsp/Kbuild b/dsp/Kbuild
index 11f63dc..348e2ee 100644
--- a/dsp/Kbuild
+++ b/dsp/Kbuild
@@ -30,14 +30,14 @@
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SM8150), y)
- include $(AUDIO_ROOT)/config/sdm855auto.conf
+ include $(AUDIO_ROOT)/config/sm8150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
- include $(AUDIO_ROOT)/config/sdm855auto.conf
+ include $(AUDIO_ROOT)/config/sm8150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
endif
diff --git a/dsp/codecs/Android.mk b/dsp/codecs/Android.mk
index 50ec167..a2fd453 100644
--- a/dsp/codecs/Android.mk
+++ b/dsp/codecs/Android.mk
@@ -12,7 +12,7 @@
endif
ifeq ($(call is-board-platform,msmnile),true)
-AUDIO_SELECT := CONFIG_SND_SOC_SDM855=m
+AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif
AUDIO_CHIPSET := audio
diff --git a/dsp/codecs/Kbuild b/dsp/codecs/Kbuild
index 09d7726..cc9a2db 100644
--- a/dsp/codecs/Kbuild
+++ b/dsp/codecs/Kbuild
@@ -31,14 +31,14 @@
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SM8150), y)
- include $(AUDIO_ROOT)/config/sdm855auto.conf
+ include $(AUDIO_ROOT)/config/sm8150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
- include $(AUDIO_ROOT)/config/sdm855auto.conf
+ include $(AUDIO_ROOT)/config/sm8150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
endif
diff --git a/ipc/Android.mk b/ipc/Android.mk
index e6ad346..38b215f 100644
--- a/ipc/Android.mk
+++ b/ipc/Android.mk
@@ -12,7 +12,7 @@
endif
ifeq ($(call is-board-platform,msmnile),true)
-AUDIO_SELECT := CONFIG_SND_SOC_SDM855=m
+AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif
AUDIO_CHIPSET := audio
diff --git a/ipc/Kbuild b/ipc/Kbuild
index a9bda63..afcb967 100644
--- a/ipc/Kbuild
+++ b/ipc/Kbuild
@@ -47,14 +47,14 @@
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SM8150), y)
- include $(AUDIO_ROOT)/config/sdm855auto.conf
+ include $(AUDIO_ROOT)/config/sm8150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
- include $(AUDIO_ROOT)/config/sdm855auto.conf
+ include $(AUDIO_ROOT)/config/sm8150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
endif
diff --git a/soc/Android.mk b/soc/Android.mk
index fa2569a..f92e238 100644
--- a/soc/Android.mk
+++ b/soc/Android.mk
@@ -12,7 +12,7 @@
endif
ifeq ($(call is-board-platform,msmnile),true)
-AUDIO_SELECT := CONFIG_SND_SOC_SDM855=m
+AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif
AUDIO_CHIPSET := audio
diff --git a/soc/Kbuild b/soc/Kbuild
index 8339028..9007b8e 100644
--- a/soc/Kbuild
+++ b/soc/Kbuild
@@ -30,14 +30,14 @@
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SM8150), y)
- include $(AUDIO_ROOT)/config/sdm855auto.conf
+ include $(AUDIO_ROOT)/config/sm8150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
- include $(AUDIO_ROOT)/config/sdm855auto.conf
+ include $(AUDIO_ROOT)/config/sm8150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
endif