OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: qcom: make common.c as proper module 

This patch converts common helper functions in to proper module
and also fixes below warning.

WARNING: sound/soc/qcom/snd-soc-sdm845: 'qcom_snd_parse_of' exported twice.
Previous export was in sound/soc/qcom/snd-soc-apq8096.ko

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Srinivas Kandagatla 2018-08-06 11:12:05 +01:00 committed by Mark Brown
parent bee7d3c9f8
commit 8e3684f66e
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/qcom/Kconfig
View File

@ -41,6 +41,9 @@ config SND_SOC_APQ8016_SBC
APQ8016 SOC-based systems. APQ8016 SOC-based systems.
Say Y if you want to use audio devices on MI2S. Say Y if you want to use audio devices on MI2S.
config SND_SOC_QCOM_COMMON
tristate
config SND_SOC_QDSP6_COMMON config SND_SOC_QDSP6_COMMON
tristate tristate
@ -86,6 +89,7 @@ config SND_SOC_MSM8996
tristate "SoC Machine driver for MSM8996 and APQ8096 boards" tristate "SoC Machine driver for MSM8996 and APQ8096 boards"
depends on QCOM_APR depends on QCOM_APR
select SND_SOC_QDSP6 select SND_SOC_QDSP6
select SND_SOC_QCOM_COMMON
help help
Support for Qualcomm Technologies LPASS audio block in Support for Qualcomm Technologies LPASS audio block in
APQ8096 SoC-based systems. APQ8096 SoC-based systems.
@ -95,6 +99,7 @@ config SND_SOC_SDM845
tristate "SoC Machine driver for SDM845 boards" tristate "SoC Machine driver for SDM845 boards"
depends on QCOM_APR depends on QCOM_APR
select SND_SOC_QDSP6 select SND_SOC_QDSP6
select SND_SOC_QCOM_COMMON
help help
To add support for audio on Qualcomm Technologies Inc. To add support for audio on Qualcomm Technologies Inc.
SDM845 SoC-based systems. SDM845 SoC-based systems.

6
sound/soc/qcom/Makefile
View File

@ -13,13 +13,15 @@ obj-$(CONFIG_SND_SOC_LPASS_APQ8016) += snd-soc-lpass-apq8016.o
# Machine # Machine
snd-soc-storm-objs := storm.o snd-soc-storm-objs := storm.o
snd-soc-apq8016-sbc-objs := apq8016_sbc.o snd-soc-apq8016-sbc-objs := apq8016_sbc.o
snd-soc-apq8096-objs := apq8096.o common.o snd-soc-apq8096-objs := apq8096.o
snd-soc-sdm845-objs := sdm845.o common.o snd-soc-sdm845-objs := sdm845.o
snd-soc-qcom-common-objs := common.o
obj-$(CONFIG_SND_SOC_STORM) += snd-soc-storm.o obj-$(CONFIG_SND_SOC_STORM) += snd-soc-storm.o
obj-$(CONFIG_SND_SOC_APQ8016_SBC) += snd-soc-apq8016-sbc.o obj-$(CONFIG_SND_SOC_APQ8016_SBC) += snd-soc-apq8016-sbc.o
obj-$(CONFIG_SND_SOC_MSM8996) += snd-soc-apq8096.o obj-$(CONFIG_SND_SOC_MSM8996) += snd-soc-apq8096.o
obj-$(CONFIG_SND_SOC_SDM845) += snd-soc-sdm845.o obj-$(CONFIG_SND_SOC_SDM845) += snd-soc-sdm845.o
obj-$(CONFIG_SND_SOC_QCOM_COMMON) += snd-soc-qcom-common.o
#DSP lib #DSP lib
obj-$(CONFIG_SND_SOC_QDSP6) += qdsp6/ obj-$(CONFIG_SND_SOC_QDSP6) += qdsp6/