samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

audio-kernel: update chipset name

Browse Source 
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>
This commit is contained in:
Xiaoyu Ye
2018-04-12 12:43:13 -07:00
parent 293a5f9afe
commit 60c105d5c9
21 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -12,11 +12,11 @@ include $(srctree)/techpack/audio/config/sdxpoorwillsauto.conf
export export
endif endif
ifeq ($(CONFIG_ARCH_SM8150), y) ifeq ($(CONFIG_ARCH_SM8150), y)
include $(srctree)/techpack/audio/config/sdm855auto.conf include $(srctree)/techpack/audio/config/sm8150auto.conf
export export
endif endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
include $(srctree)/techpack/audio/config/sdm855auto.conf include $(srctree)/techpack/audio/config/sm8150auto.conf
export export
endif endif
@@ -44,11 +44,11 @@ LINUXINCLUDE += \
endif endif
ifeq ($(CONFIG_ARCH_SM8150), y) ifeq ($(CONFIG_ARCH_SM8150), y)
LINUXINCLUDE += \ LINUXINCLUDE += \
-include $(srctree)/techpack/audio/config/sdm855autoconf.h -include $(srctree)/techpack/audio/config/sm8150autoconf.h
endif endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
LINUXINCLUDE += \ LINUXINCLUDE += \
-include $(srctree)/techpack/audio/config/sdm855autoconf.h -include $(srctree)/techpack/audio/config/sm8150autoconf.h
endif endif
obj-y += asoc/ obj-y += asoc/

2
asoc/Android.mk
View File

@@ -15,7 +15,7 @@ endif
ifeq ($(call is-board-platform,msmnile),true) ifeq ($(call is-board-platform,msmnile),true)
TARGET := msmnile TARGET := msmnile
AUDIO_SELECT := CONFIG_SND_SOC_SDM855=m AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif endif
AUDIO_CHIPSET := audio AUDIO_CHIPSET := audio

16
asoc/Kbuild
View File

@@ -31,14 +31,14 @@ ifeq ($(KERNEL_BUILD), 0)
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif endif
ifeq ($(CONFIG_ARCH_SM8150), y) ifeq ($(CONFIG_ARCH_SM8150), y)
include $(AUDIO_ROOT)/config/sdm855auto.conf include $(AUDIO_ROOT)/config/sm8150auto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
include $(AUDIO_ROOT)/config/sdm855auto.conf include $(AUDIO_ROOT)/config/sm8150auto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif endif
endif endif
@@ -90,9 +90,9 @@ ifdef CONFIG_SND_SOC_MACHINE_SDM845
MACHINE_OBJS += sdm845.o MACHINE_OBJS += sdm845.o
endif endif
# for SDM855 sound card driver # for SM8150 sound card driver
ifdef CONFIG_SND_SOC_SDM855 ifdef CONFIG_SND_SOC_SM8150
MACHINE_OBJS += sdm855.o MACHINE_OBJS += sm8150.o
endif endif
ifdef CONFIG_SND_SOC_CPE ifdef CONFIG_SND_SOC_CPE
@@ -183,7 +183,7 @@ platform_dlkm-y := $(PLATFORM_OBJS)
obj-$(CONFIG_SND_SOC_MACHINE_SDM845) += machine_dlkm.o obj-$(CONFIG_SND_SOC_MACHINE_SDM845) += machine_dlkm.o
machine_dlkm-y := $(MACHINE_OBJS) 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) machine_dlkm-y := $(MACHINE_OBJS)
obj-$(CONFIG_SND_SOC_EXT_CODEC) += machine_dlkm.o obj-$(CONFIG_SND_SOC_EXT_CODEC) += machine_dlkm.o

2
asoc/codecs/Android.mk
View File

@@ -12,7 +12,7 @@ AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
endif endif
ifeq ($(call is-board-platform,msmnile),true) ifeq ($(call is-board-platform,msmnile),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM855=m AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif endif
AUDIO_CHIPSET := audio AUDIO_CHIPSET := audio

8
asoc/codecs/Kbuild
View File

@@ -30,14 +30,14 @@ ifeq ($(KERNEL_BUILD), 0)
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif endif
ifeq ($(CONFIG_ARCH_SM8150), y) ifeq ($(CONFIG_ARCH_SM8150), y)
include $(AUDIO_ROOT)/config/sdm855auto.conf include $(AUDIO_ROOT)/config/sm8150auto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
include $(AUDIO_ROOT)/config/sdm855auto.conf include $(AUDIO_ROOT)/config/sm8150auto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif endif
endif endif

8
asoc/codecs/aqt1000/Kbuild
View File

@@ -24,15 +24,15 @@ ifeq ($(KERNEL_BUILD), 0)
endif endif
ifeq ($(CONFIG_ARCH_SM8150), y) ifeq ($(CONFIG_ARCH_SM8150), y)
include $(AUDIO_ROOT)/config/sdm855auto.conf include $(AUDIO_ROOT)/config/sm8150auto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
include $(AUDIO_ROOT)/config/sdm855auto.conf include $(AUDIO_ROOT)/config/sm8150auto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif endif
endif endif

2
asoc/codecs/wcd934x/Android.mk
View File

@@ -8,7 +8,7 @@ AUDIO_SELECT := CONFIG_SND_SOC_SDM845=m
endif endif
ifeq ($(call is-board-platform,msmnile),true) ifeq ($(call is-board-platform,msmnile),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM855=m AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif endif
ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605),true) ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605),true)

8
asoc/codecs/wcd934x/Kbuild
View File

@@ -32,14 +32,14 @@ ifeq ($(KERNEL_BUILD), 0)
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif endif
ifeq ($(CONFIG_ARCH_SM8150), y) ifeq ($(CONFIG_ARCH_SM8150), y)
include $(AUDIO_ROOT)/config/sdm855auto.conf include $(AUDIO_ROOT)/config/sm8150auto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
include $(AUDIO_ROOT)/config/sdm855auto.conf include $(AUDIO_ROOT)/config/sm8150auto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif endif
endif endif

2
asoc/codecs/wcd9360/Android.mk
View File

@@ -4,7 +4,7 @@
# Check if this driver needs be built for current target # Check if this driver needs be built for current target
ifeq ($(call is-board-platform,msmnile),true) ifeq ($(call is-board-platform,msmnile),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM855=m AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif endif
AUDIO_CHIPSET := audio AUDIO_CHIPSET := audio

8
asoc/codecs/wcd9360/Kbuild
View File

@@ -17,15 +17,15 @@ endif
ifeq ($(KERNEL_BUILD), 0) ifeq ($(KERNEL_BUILD), 0)
ifeq ($(CONFIG_ARCH_SM8150), y) ifeq ($(CONFIG_ARCH_SM8150), y)
include $(AUDIO_ROOT)/config/sdm855auto.conf include $(AUDIO_ROOT)/config/sm8150auto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
include $(AUDIO_ROOT)/config/sdm855auto.conf include $(AUDIO_ROOT)/config/sm8150auto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif endif
endif endif

60
asoc/sdm855.c → asoc/sm8150.c
View File

@@ -40,9 +40,9 @@
#include "codecs/wsa881x.h" #include "codecs/wsa881x.h"
#include "codecs/wcd-mbhc-v2.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 MSM_DAILINK_NAME(name) (__CHIPSET__#name)
#define DEV_NAME_STR_LEN 32 #define DEV_NAME_STR_LEN 32
@@ -3740,7 +3740,7 @@ err:
return ret; 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) unsigned long opcode, void *ptr)
{ {
int ret; int ret;
@@ -3798,7 +3798,7 @@ err:
} }
static struct notifier_block service_nb = { static struct notifier_block service_nb = {
.notifier_call = sdm855_notifier_service_cb, .notifier_call = sm8150_notifier_service_cb,
.priority = -INT_MAX, .priority = -INT_MAX,
}; };
@@ -4509,7 +4509,7 @@ static int msm_tdm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
return 0; 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_pcm_hw_params *params)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -4625,7 +4625,7 @@ end:
return ret; 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; int ret = 0;
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -4646,7 +4646,7 @@ static int sdm855_tdm_snd_startup(struct snd_pcm_substream *substream)
return ret; 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; int ret = 0;
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -4665,10 +4665,10 @@ static void sdm855_tdm_snd_shutdown(struct snd_pcm_substream *substream)
} }
} }
static struct snd_soc_ops sdm855_tdm_be_ops = { static struct snd_soc_ops sm8150_tdm_be_ops = {
.hw_params = sdm855_tdm_snd_hw_params, .hw_params = sm8150_tdm_snd_hw_params,
.startup = sdm855_tdm_snd_startup, .startup = sm8150_tdm_snd_startup,
.shutdown = sdm855_tdm_snd_shutdown .shutdown = sm8150_tdm_snd_shutdown
}; };
static int msm_fe_qos_prepare(struct snd_pcm_substream *substream) static int msm_fe_qos_prepare(struct snd_pcm_substream *substream)
@@ -5630,7 +5630,7 @@ static struct snd_soc_dai_link msm_common_be_dai_links[] = {
.dpcm_playback = 1, .dpcm_playback = 1,
.id = MSM_BACKEND_DAI_PRI_TDM_RX_0, .id = MSM_BACKEND_DAI_PRI_TDM_RX_0,
.be_hw_params_fixup = msm_be_hw_params_fixup, .be_hw_params_fixup = msm_be_hw_params_fixup,
.ops = &sdm855_tdm_be_ops, .ops = &sm8150_tdm_be_ops,
.ignore_suspend = 1, .ignore_suspend = 1,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
}, },
@@ -5645,7 +5645,7 @@ static struct snd_soc_dai_link msm_common_be_dai_links[] = {
.dpcm_capture = 1, .dpcm_capture = 1,
.id = MSM_BACKEND_DAI_PRI_TDM_TX_0, .id = MSM_BACKEND_DAI_PRI_TDM_TX_0,
.be_hw_params_fixup = msm_be_hw_params_fixup, .be_hw_params_fixup = msm_be_hw_params_fixup,
.ops = &sdm855_tdm_be_ops, .ops = &sm8150_tdm_be_ops,
.ignore_suspend = 1, .ignore_suspend = 1,
}, },
{ {
@@ -5659,7 +5659,7 @@ static struct snd_soc_dai_link msm_common_be_dai_links[] = {
.dpcm_playback = 1, .dpcm_playback = 1,
.id = MSM_BACKEND_DAI_SEC_TDM_RX_0, .id = MSM_BACKEND_DAI_SEC_TDM_RX_0,
.be_hw_params_fixup = msm_be_hw_params_fixup, .be_hw_params_fixup = msm_be_hw_params_fixup,
.ops = &sdm855_tdm_be_ops, .ops = &sm8150_tdm_be_ops,
.ignore_suspend = 1, .ignore_suspend = 1,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
}, },
@@ -5674,7 +5674,7 @@ static struct snd_soc_dai_link msm_common_be_dai_links[] = {
.dpcm_capture = 1, .dpcm_capture = 1,
.id = MSM_BACKEND_DAI_SEC_TDM_TX_0, .id = MSM_BACKEND_DAI_SEC_TDM_TX_0,
.be_hw_params_fixup = msm_be_hw_params_fixup, .be_hw_params_fixup = msm_be_hw_params_fixup,
.ops = &sdm855_tdm_be_ops, .ops = &sm8150_tdm_be_ops,
.ignore_suspend = 1, .ignore_suspend = 1,
}, },
{ {
@@ -5688,7 +5688,7 @@ static struct snd_soc_dai_link msm_common_be_dai_links[] = {
.dpcm_playback = 1, .dpcm_playback = 1,
.id = MSM_BACKEND_DAI_TERT_TDM_RX_0, .id = MSM_BACKEND_DAI_TERT_TDM_RX_0,
.be_hw_params_fixup = msm_be_hw_params_fixup, .be_hw_params_fixup = msm_be_hw_params_fixup,
.ops = &sdm855_tdm_be_ops, .ops = &sm8150_tdm_be_ops,
.ignore_suspend = 1, .ignore_suspend = 1,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
}, },
@@ -5703,7 +5703,7 @@ static struct snd_soc_dai_link msm_common_be_dai_links[] = {
.dpcm_capture = 1, .dpcm_capture = 1,
.id = MSM_BACKEND_DAI_TERT_TDM_TX_0, .id = MSM_BACKEND_DAI_TERT_TDM_TX_0,
.be_hw_params_fixup = msm_be_hw_params_fixup, .be_hw_params_fixup = msm_be_hw_params_fixup,
.ops = &sdm855_tdm_be_ops, .ops = &sm8150_tdm_be_ops,
.ignore_suspend = 1, .ignore_suspend = 1,
}, },
{ {
@@ -5717,7 +5717,7 @@ static struct snd_soc_dai_link msm_common_be_dai_links[] = {
.dpcm_playback = 1, .dpcm_playback = 1,
.id = MSM_BACKEND_DAI_QUAT_TDM_RX_0, .id = MSM_BACKEND_DAI_QUAT_TDM_RX_0,
.be_hw_params_fixup = msm_tdm_be_hw_params_fixup, .be_hw_params_fixup = msm_tdm_be_hw_params_fixup,
.ops = &sdm855_tdm_be_ops, .ops = &sm8150_tdm_be_ops,
.ignore_suspend = 1, .ignore_suspend = 1,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
}, },
@@ -5732,7 +5732,7 @@ static struct snd_soc_dai_link msm_common_be_dai_links[] = {
.dpcm_capture = 1, .dpcm_capture = 1,
.id = MSM_BACKEND_DAI_QUAT_TDM_TX_0, .id = MSM_BACKEND_DAI_QUAT_TDM_TX_0,
.be_hw_params_fixup = msm_be_hw_params_fixup, .be_hw_params_fixup = msm_be_hw_params_fixup,
.ops = &sdm855_tdm_be_ops, .ops = &sm8150_tdm_be_ops,
.ignore_suspend = 1, .ignore_suspend = 1,
}, },
}; };
@@ -6532,11 +6532,11 @@ err_pcm_runtime:
} }
struct snd_soc_card snd_soc_card_pahu_msm = { 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 = { 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, .late_probe = msm_snd_card_tavil_late_probe,
}; };
@@ -6742,10 +6742,10 @@ static struct snd_soc_dai_link msm_stub_dai_links[
ARRAY_SIZE(msm_stub_be_dai_links)]; ARRAY_SIZE(msm_stub_be_dai_links)];
struct snd_soc_card snd_soc_card_stub_msm = { 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", { .compatible = "qcom,sm8150-asoc-snd-pahu",
.data = "pahu_codec"}, .data = "pahu_codec"},
{ .compatible = "qcom,sm8150-asoc-snd-tavil", { .compatible = "qcom,sm8150-asoc-snd-tavil",
@@ -6763,7 +6763,7 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev)
int total_links; int total_links;
const struct of_device_id *match; 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) { if (!match) {
dev_err(dev, "%s: No DT match found for sound card\n", dev_err(dev, "%s: No DT match found for sound card\n",
__func__); __func__);
@@ -7327,7 +7327,7 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
msm_i2s_auxpcm_init(pdev); msm_i2s_auxpcm_init(pdev);
is_initial_boot = true; is_initial_boot = true;
ret = audio_notifier_register("sdm855", AUDIO_NOTIFIER_ADSP_DOMAIN, ret = audio_notifier_register("sm8150", AUDIO_NOTIFIER_ADSP_DOMAIN,
&service_nb); &service_nb);
if (ret < 0) if (ret < 0)
pr_err("%s: Audio notifier register failed ret = %d\n", pr_err("%s: Audio notifier register failed ret = %d\n",
@@ -7342,26 +7342,26 @@ err:
static int msm_asoc_machine_remove(struct platform_device *pdev) static int msm_asoc_machine_remove(struct platform_device *pdev)
{ {
audio_notifier_deregister("sdm855"); audio_notifier_deregister("sm8150");
msm_i2s_auxpcm_deinit(); msm_i2s_auxpcm_deinit();
msm_release_pinctrl(pdev); msm_release_pinctrl(pdev);
return 0; return 0;
} }
static struct platform_driver sdm855_asoc_machine_driver = { static struct platform_driver sm8150_asoc_machine_driver = {
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &snd_soc_pm_ops, .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, .probe = msm_asoc_machine_probe,
.remove = msm_asoc_machine_remove, .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_DESCRIPTION("ALSA SoC msm");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_ALIAS("platform:" DRV_NAME); MODULE_ALIAS("platform:" DRV_NAME);
MODULE_DEVICE_TABLE(of, sdm855_asoc_machine_of_match); MODULE_DEVICE_TABLE(of, sm8150_asoc_machine_of_match);

2
config/sdm855auto.conf → config/sm8150auto.conf
View File

@@ -23,7 +23,7 @@ CONFIG_MSM_QDSP6_PDR=m
CONFIG_MSM_QDSP6_NOTIFIER=m CONFIG_MSM_QDSP6_NOTIFIER=m
CONFIG_SND_SOC_MSM_HOSTLESS_PCM=m CONFIG_SND_SOC_MSM_HOSTLESS_PCM=m
CONFIG_SND_SOC_MSM_QDSP6V2_INTF=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_MSM_GLINK_SPI_XPRT=m
CONFIG_WCD_DSP_GLINK=m CONFIG_WCD_DSP_GLINK=m
CONFIG_SOUNDWIRE=m CONFIG_SOUNDWIRE=m

2
config/sdm855autoconf.h → config/sm8150autoconf.h
View File

@@ -34,7 +34,7 @@
#define CONFIG_MSM_QDSP6_PDR 1 #define CONFIG_MSM_QDSP6_PDR 1
#define CONFIG_MSM_QDSP6_NOTIFIER 1 #define CONFIG_MSM_QDSP6_NOTIFIER 1
#define CONFIG_SND_SOC_MSM_HOSTLESS_PCM 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_MSM_GLINK_SPI_XPRT 1
#define CONFIG_WCD_DSP_GLINK 1 #define CONFIG_WCD_DSP_GLINK 1
#define CONFIG_SOUNDWIRE 1 #define CONFIG_SOUNDWIRE 1

2
dsp/Android.mk
View File

@@ -12,7 +12,7 @@ AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
endif endif
ifeq ($(call is-board-platform,msmnile),true) ifeq ($(call is-board-platform,msmnile),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM855=m AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif endif
AUDIO_CHIPSET := audio AUDIO_CHIPSET := audio

8
dsp/Kbuild
View File

@@ -30,14 +30,14 @@ ifeq ($(KERNEL_BUILD), 0)
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif endif
ifeq ($(CONFIG_ARCH_SM8150), y) ifeq ($(CONFIG_ARCH_SM8150), y)
include $(AUDIO_ROOT)/config/sdm855auto.conf include $(AUDIO_ROOT)/config/sm8150auto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
include $(AUDIO_ROOT)/config/sdm855auto.conf include $(AUDIO_ROOT)/config/sm8150auto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif endif
endif endif

2
dsp/codecs/Android.mk
View File

@@ -12,7 +12,7 @@ AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
endif endif
ifeq ($(call is-board-platform,msmnile),true) ifeq ($(call is-board-platform,msmnile),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM855=m AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif endif
AUDIO_CHIPSET := audio AUDIO_CHIPSET := audio

8
dsp/codecs/Kbuild
View File

@@ -31,14 +31,14 @@ ifeq ($(KERNEL_BUILD), 0)
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif endif
ifeq ($(CONFIG_ARCH_SM8150), y) ifeq ($(CONFIG_ARCH_SM8150), y)
include $(AUDIO_ROOT)/config/sdm855auto.conf include $(AUDIO_ROOT)/config/sm8150auto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
include $(AUDIO_ROOT)/config/sdm855auto.conf include $(AUDIO_ROOT)/config/sm8150auto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif endif
endif endif

2
ipc/Android.mk
View File

@@ -12,7 +12,7 @@ AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
endif endif
ifeq ($(call is-board-platform,msmnile),true) ifeq ($(call is-board-platform,msmnile),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM855=m AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif endif
AUDIO_CHIPSET := audio AUDIO_CHIPSET := audio

8
ipc/Kbuild
View File

@@ -47,14 +47,14 @@ ifeq ($(KERNEL_BUILD), 0)
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif endif
ifeq ($(CONFIG_ARCH_SM8150), y) ifeq ($(CONFIG_ARCH_SM8150), y)
include $(AUDIO_ROOT)/config/sdm855auto.conf include $(AUDIO_ROOT)/config/sm8150auto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
include $(AUDIO_ROOT)/config/sdm855auto.conf include $(AUDIO_ROOT)/config/sm8150auto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif endif
endif endif

2
soc/Android.mk
View File

@@ -12,7 +12,7 @@ AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
endif endif
ifeq ($(call is-board-platform,msmnile),true) ifeq ($(call is-board-platform,msmnile),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM855=m AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif endif
AUDIO_CHIPSET := audio AUDIO_CHIPSET := audio

8
soc/Kbuild
View File

@@ -30,14 +30,14 @@ ifeq ($(KERNEL_BUILD), 0)
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif endif
ifeq ($(CONFIG_ARCH_SM8150), y) ifeq ($(CONFIG_ARCH_SM8150), y)
include $(AUDIO_ROOT)/config/sdm855auto.conf include $(AUDIO_ROOT)/config/sm8150auto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
include $(AUDIO_ROOT)/config/sdm855auto.conf include $(AUDIO_ROOT)/config/sm8150auto.conf
export export
INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif endif
endif endif