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>

diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig
index 5f03312ef0074fcf7f7cc2d89f34606658644946..2a4c912d1e484df0c605af91371fa6ee3460bf63 100644 (file)
--- a/sound/soc/qcom/Kconfig
+++ b/sound/soc/qcom/Kconfig
@@ -41,6 +41,9 @@ config SND_SOC_APQ8016_SBC
           APQ8016 SOC-based systems.
           Say Y if you want to use audio devices on MI2S.
 
+config SND_SOC_QCOM_COMMON
+       tristate
+
 config SND_SOC_QDSP6_COMMON
        tristate
 
@@ -86,6 +89,7 @@ config SND_SOC_MSM8996
        tristate "SoC Machine driver for MSM8996 and APQ8096 boards"
        depends on QCOM_APR
        select SND_SOC_QDSP6
+       select SND_SOC_QCOM_COMMON
        help
           Support for Qualcomm Technologies LPASS audio block in
           APQ8096 SoC-based systems.
@@ -95,6 +99,7 @@ config SND_SOC_SDM845
        tristate "SoC Machine driver for SDM845 boards"
        depends on QCOM_APR
        select SND_SOC_QDSP6
+       select SND_SOC_QCOM_COMMON
        help
          To add support for audio on Qualcomm Technologies Inc.
          SDM845 SoC-based systems.

diff --git a/sound/soc/qcom/Makefile b/sound/soc/qcom/Makefile
index f0e94d48ba9887b1f802aaf73a4f55158890b475..41b2c7a23a4db6c0237a21f8c5cbb5cc63cb6d19 100644 (file)
--- a/sound/soc/qcom/Makefile
+++ b/sound/soc/qcom/Makefile
@@ -13,13 +13,15 @@ obj-$(CONFIG_SND_SOC_LPASS_APQ8016) += snd-soc-lpass-apq8016.o
 # Machine
 snd-soc-storm-objs := storm.o
 snd-soc-apq8016-sbc-objs := apq8016_sbc.o
-snd-soc-apq8096-objs := apq8096.o common.o
-snd-soc-sdm845-objs := sdm845.o common.o
+snd-soc-apq8096-objs := apq8096.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_APQ8016_SBC) += snd-soc-apq8016-sbc.o
 obj-$(CONFIG_SND_SOC_MSM8996) += snd-soc-apq8096.o
 obj-$(CONFIG_SND_SOC_SDM845) += snd-soc-sdm845.o
+obj-$(CONFIG_SND_SOC_QCOM_COMMON) += snd-soc-qcom-common.o
 
 #DSP lib
 obj-$(CONFIG_SND_SOC_QDSP6) += qdsp6/