diff options
author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2018-08-06 06:12:05 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-08-06 07:50:04 -0400 |
commit | 8e3684f66e15c354dba5544c2af8ce973ed40cf6 (patch) | |
tree | fb741b83578cd6e793dc69e35b7666134a1c3c9e | |
parent | bee7d3c9f89a1bbe3d5f88ac9d6946de4705731b (diff) |
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>
-rw-r--r-- | sound/soc/qcom/Kconfig | 5 | ||||
-rw-r--r-- | sound/soc/qcom/Makefile | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig index 5f03312ef007..2a4c912d1e48 100644 --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig | |||
@@ -41,6 +41,9 @@ config SND_SOC_APQ8016_SBC | |||
41 | APQ8016 SOC-based systems. | 41 | APQ8016 SOC-based systems. |
42 | Say Y if you want to use audio devices on MI2S. | 42 | Say Y if you want to use audio devices on MI2S. |
43 | 43 | ||
44 | config SND_SOC_QCOM_COMMON | ||
45 | tristate | ||
46 | |||
44 | config SND_SOC_QDSP6_COMMON | 47 | config SND_SOC_QDSP6_COMMON |
45 | tristate | 48 | tristate |
46 | 49 | ||
@@ -86,6 +89,7 @@ config SND_SOC_MSM8996 | |||
86 | tristate "SoC Machine driver for MSM8996 and APQ8096 boards" | 89 | tristate "SoC Machine driver for MSM8996 and APQ8096 boards" |
87 | depends on QCOM_APR | 90 | depends on QCOM_APR |
88 | select SND_SOC_QDSP6 | 91 | select SND_SOC_QDSP6 |
92 | select SND_SOC_QCOM_COMMON | ||
89 | help | 93 | help |
90 | Support for Qualcomm Technologies LPASS audio block in | 94 | Support for Qualcomm Technologies LPASS audio block in |
91 | APQ8096 SoC-based systems. | 95 | APQ8096 SoC-based systems. |
@@ -95,6 +99,7 @@ config SND_SOC_SDM845 | |||
95 | tristate "SoC Machine driver for SDM845 boards" | 99 | tristate "SoC Machine driver for SDM845 boards" |
96 | depends on QCOM_APR | 100 | depends on QCOM_APR |
97 | select SND_SOC_QDSP6 | 101 | select SND_SOC_QDSP6 |
102 | select SND_SOC_QCOM_COMMON | ||
98 | help | 103 | help |
99 | To add support for audio on Qualcomm Technologies Inc. | 104 | To add support for audio on Qualcomm Technologies Inc. |
100 | SDM845 SoC-based systems. | 105 | SDM845 SoC-based systems. |
diff --git a/sound/soc/qcom/Makefile b/sound/soc/qcom/Makefile index f0e94d48ba98..41b2c7a23a4d 100644 --- 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 | |||
13 | # Machine | 13 | # Machine |
14 | snd-soc-storm-objs := storm.o | 14 | snd-soc-storm-objs := storm.o |
15 | snd-soc-apq8016-sbc-objs := apq8016_sbc.o | 15 | snd-soc-apq8016-sbc-objs := apq8016_sbc.o |
16 | snd-soc-apq8096-objs := apq8096.o common.o | 16 | snd-soc-apq8096-objs := apq8096.o |
17 | snd-soc-sdm845-objs := sdm845.o common.o | 17 | snd-soc-sdm845-objs := sdm845.o |
18 | snd-soc-qcom-common-objs := common.o | ||
18 | 19 | ||
19 | obj-$(CONFIG_SND_SOC_STORM) += snd-soc-storm.o | 20 | obj-$(CONFIG_SND_SOC_STORM) += snd-soc-storm.o |
20 | obj-$(CONFIG_SND_SOC_APQ8016_SBC) += snd-soc-apq8016-sbc.o | 21 | obj-$(CONFIG_SND_SOC_APQ8016_SBC) += snd-soc-apq8016-sbc.o |
21 | obj-$(CONFIG_SND_SOC_MSM8996) += snd-soc-apq8096.o | 22 | obj-$(CONFIG_SND_SOC_MSM8996) += snd-soc-apq8096.o |
22 | obj-$(CONFIG_SND_SOC_SDM845) += snd-soc-sdm845.o | 23 | obj-$(CONFIG_SND_SOC_SDM845) += snd-soc-sdm845.o |
24 | obj-$(CONFIG_SND_SOC_QCOM_COMMON) += snd-soc-qcom-common.o | ||
23 | 25 | ||
24 | #DSP lib | 26 | #DSP lib |
25 | obj-$(CONFIG_SND_SOC_QDSP6) += qdsp6/ | 27 | obj-$(CONFIG_SND_SOC_QDSP6) += qdsp6/ |