* [PATCH 0/5] ASoC: qcom: few trival fixes
@ 2018-08-06 10:12 Srinivas Kandagatla
2018-08-06 10:12 ` [PATCH 1/5] ASoC: qcom: make common.c as proper module Srinivas Kandagatla
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Srinivas Kandagatla @ 2018-08-06 10:12 UTC (permalink / raw)
To: broonie, lgirdwood, alsa-devel
Cc: perex, tiwai, vkoul, linux-kernel, rohitkr, bgoswami,
Srinivas Kandagatla
This patchset have few trivial fixes, 3 of them to do with cleaning up the
unused header files, 1 patch is to do with fixing warning on common.c and
other is to add missing AIF_IN dapm for slim tx ports.
Thanks,
srini
Srinivas Kandagatla (5):
ASoC: qcom: make common.c as proper module
ASoC: apq8096: remove unused header files
ASoC: sdm845: remove unused header files
ASoC: qcom: remove unused header files from common.h
ASoC: qdsp6: q6afe-dai: add SLIM tx AIF_IN dapm
sound/soc/qcom/Kconfig | 5 +++++
sound/soc/qcom/Makefile | 6 ++++--
sound/soc/qcom/apq8096.c | 2 --
sound/soc/qcom/common.h | 1 -
sound/soc/qcom/qdsp6/q6afe-dai.c | 7 +++++++
sound/soc/qcom/sdm845.c | 2 --
6 files changed, 16 insertions(+), 7 deletions(-)
--
2.16.2
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/5] ASoC: qcom: make common.c as proper module
2018-08-06 10:12 [PATCH 0/5] ASoC: qcom: few trival fixes Srinivas Kandagatla
@ 2018-08-06 10:12 ` Srinivas Kandagatla
2018-08-06 11:51 ` Applied "ASoC: qcom: make common.c as proper module" to the asoc tree Mark Brown
2018-08-06 10:12 ` [PATCH 2/5] ASoC: apq8096: remove unused header files Srinivas Kandagatla
` (3 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Srinivas Kandagatla @ 2018-08-06 10:12 UTC (permalink / raw)
To: broonie, lgirdwood, alsa-devel
Cc: perex, tiwai, vkoul, linux-kernel, rohitkr, bgoswami,
Srinivas Kandagatla
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>
---
sound/soc/qcom/Kconfig | 5 +++++
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
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 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
# 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/
--
2.16.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/5] ASoC: apq8096: remove unused header files
2018-08-06 10:12 [PATCH 0/5] ASoC: qcom: few trival fixes Srinivas Kandagatla
2018-08-06 10:12 ` [PATCH 1/5] ASoC: qcom: make common.c as proper module Srinivas Kandagatla
@ 2018-08-06 10:12 ` Srinivas Kandagatla
2018-08-06 11:50 ` Applied "ASoC: apq8096: remove unused header files" to the asoc tree Mark Brown
2018-08-06 10:12 ` [PATCH 3/5] ASoC: sdm845: remove unused header files Srinivas Kandagatla
` (2 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Srinivas Kandagatla @ 2018-08-06 10:12 UTC (permalink / raw)
To: broonie, lgirdwood, alsa-devel
Cc: perex, tiwai, vkoul, linux-kernel, rohitkr, bgoswami,
Srinivas Kandagatla
This patch removes unused header files from the driver.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
sound/soc/qcom/apq8096.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sound/soc/qcom/apq8096.c b/sound/soc/qcom/apq8096.c
index 6ee7e66cbaaa..1543e85629f8 100644
--- a/sound/soc/qcom/apq8096.c
+++ b/sound/soc/qcom/apq8096.c
@@ -1,9 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
// Copyright (c) 2018, Linaro Limited
-#include <linux/soc/qcom/apr.h>
#include <linux/module.h>
-#include <linux/component.h>
#include <linux/platform_device.h>
#include <linux/of_device.h>
#include <sound/soc.h>
--
2.16.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/5] ASoC: sdm845: remove unused header files
2018-08-06 10:12 [PATCH 0/5] ASoC: qcom: few trival fixes Srinivas Kandagatla
2018-08-06 10:12 ` [PATCH 1/5] ASoC: qcom: make common.c as proper module Srinivas Kandagatla
2018-08-06 10:12 ` [PATCH 2/5] ASoC: apq8096: remove unused header files Srinivas Kandagatla
@ 2018-08-06 10:12 ` Srinivas Kandagatla
2018-08-06 11:50 ` Applied "ASoC: sdm845: remove unused header files" to the asoc tree Mark Brown
2018-08-06 10:12 ` [PATCH 4/5] ASoC: qcom: remove unused header files from common.h Srinivas Kandagatla
2018-08-06 10:12 ` [PATCH 5/5] ASoC: qdsp6: q6afe-dai: add SLIM tx AIF_IN dapm Srinivas Kandagatla
4 siblings, 1 reply; 11+ messages in thread
From: Srinivas Kandagatla @ 2018-08-06 10:12 UTC (permalink / raw)
To: broonie, lgirdwood, alsa-devel
Cc: perex, tiwai, vkoul, linux-kernel, rohitkr, bgoswami,
Srinivas Kandagatla
This patch removes unused header files from the driver.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
sound/soc/qcom/sdm845.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sound/soc/qcom/sdm845.c b/sound/soc/qcom/sdm845.c
index be0cb1122036..c9884e380549 100644
--- a/sound/soc/qcom/sdm845.c
+++ b/sound/soc/qcom/sdm845.c
@@ -5,11 +5,9 @@
#include <linux/module.h>
#include <linux/platform_device.h>
-#include <linux/atomic.h>
#include <linux/of_device.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
-#include <linux/soc/qcom/apr.h>
#include "common.h"
#include "qdsp6/q6afe.h"
--
2.16.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/5] ASoC: qcom: remove unused header files from common.h
2018-08-06 10:12 [PATCH 0/5] ASoC: qcom: few trival fixes Srinivas Kandagatla
` (2 preceding siblings ...)
2018-08-06 10:12 ` [PATCH 3/5] ASoC: sdm845: remove unused header files Srinivas Kandagatla
@ 2018-08-06 10:12 ` Srinivas Kandagatla
2018-08-06 11:50 ` Applied "ASoC: qcom: remove unused header files from common.h" to the asoc tree Mark Brown
2018-08-06 10:12 ` [PATCH 5/5] ASoC: qdsp6: q6afe-dai: add SLIM tx AIF_IN dapm Srinivas Kandagatla
4 siblings, 1 reply; 11+ messages in thread
From: Srinivas Kandagatla @ 2018-08-06 10:12 UTC (permalink / raw)
To: broonie, lgirdwood, alsa-devel
Cc: perex, tiwai, vkoul, linux-kernel, rohitkr, bgoswami,
Srinivas Kandagatla
This patch removes unused header files from common.h.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
sound/soc/qcom/common.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/sound/soc/qcom/common.h b/sound/soc/qcom/common.h
index ad5d2cf27459..f05c05b12bd7 100644
--- a/sound/soc/qcom/common.h
+++ b/sound/soc/qcom/common.h
@@ -4,7 +4,6 @@
#ifndef __QCOM_SND_COMMON_H__
#define __QCOM_SND_COMMON_H__
-#include <linux/component.h>
#include <sound/soc.h>
int qcom_snd_parse_of(struct snd_soc_card *card);
--
2.16.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 5/5] ASoC: qdsp6: q6afe-dai: add SLIM tx AIF_IN dapm
2018-08-06 10:12 [PATCH 0/5] ASoC: qcom: few trival fixes Srinivas Kandagatla
` (3 preceding siblings ...)
2018-08-06 10:12 ` [PATCH 4/5] ASoC: qcom: remove unused header files from common.h Srinivas Kandagatla
@ 2018-08-06 10:12 ` Srinivas Kandagatla
2018-08-06 11:50 ` Applied "ASoC: qdsp6: q6afe-dai: add SLIM tx AIF_IN dapm" to the asoc tree Mark Brown
4 siblings, 1 reply; 11+ messages in thread
From: Srinivas Kandagatla @ 2018-08-06 10:12 UTC (permalink / raw)
To: broonie, lgirdwood, alsa-devel
Cc: perex, tiwai, vkoul, linux-kernel, rohitkr, bgoswami,
Srinivas Kandagatla
Add missing AIF_IN dapm for slim tx ports.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
sound/soc/qcom/qdsp6/q6afe-dai.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/sound/soc/qcom/qdsp6/q6afe-dai.c b/sound/soc/qcom/qdsp6/q6afe-dai.c
index 475d193c5e2e..60ff4a2d3577 100644
--- a/sound/soc/qcom/qdsp6/q6afe-dai.c
+++ b/sound/soc/qcom/qdsp6/q6afe-dai.c
@@ -1120,6 +1120,13 @@ static const struct snd_soc_dapm_widget q6afe_dai_widgets[] = {
SND_SOC_DAPM_AIF_OUT("SLIMBUS_4_RX", "Slimbus4 Playback", 0, 0, 0, 0),
SND_SOC_DAPM_AIF_OUT("SLIMBUS_5_RX", "Slimbus5 Playback", 0, 0, 0, 0),
SND_SOC_DAPM_AIF_OUT("SLIMBUS_6_RX", "Slimbus6 Playback", 0, 0, 0, 0),
+ SND_SOC_DAPM_AIF_IN("SLIMBUS_0_TX", "Slimbus Capture", 0, 0, 0, 0),
+ SND_SOC_DAPM_AIF_IN("SLIMBUS_1_TX", "Slimbus1 Capture", 0, 0, 0, 0),
+ SND_SOC_DAPM_AIF_IN("SLIMBUS_2_TX", "Slimbus2 Capture", 0, 0, 0, 0),
+ SND_SOC_DAPM_AIF_IN("SLIMBUS_3_TX", "Slimbus3 Capture", 0, 0, 0, 0),
+ SND_SOC_DAPM_AIF_IN("SLIMBUS_4_TX", "Slimbus4 Capture", 0, 0, 0, 0),
+ SND_SOC_DAPM_AIF_IN("SLIMBUS_5_TX", "Slimbus5 Capture", 0, 0, 0, 0),
+ SND_SOC_DAPM_AIF_IN("SLIMBUS_6_TX", "Slimbus6 Capture", 0, 0, 0, 0),
SND_SOC_DAPM_AIF_OUT("QUAT_MI2S_RX", "Quaternary MI2S Playback",
0, 0, 0, 0),
SND_SOC_DAPM_AIF_IN("QUAT_MI2S_TX", "Quaternary MI2S Capture",
--
2.16.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Applied "ASoC: qdsp6: q6afe-dai: add SLIM tx AIF_IN dapm" to the asoc tree
2018-08-06 10:12 ` [PATCH 5/5] ASoC: qdsp6: q6afe-dai: add SLIM tx AIF_IN dapm Srinivas Kandagatla
@ 2018-08-06 11:50 ` Mark Brown
0 siblings, 0 replies; 11+ messages in thread
From: Mark Brown @ 2018-08-06 11:50 UTC (permalink / raw)
To: Srinivas Kandagatla
Cc: Mark Brown, broonie, lgirdwood, alsa-devel, bgoswami,
linux-kernel, tiwai, vkoul, rohitkr, alsa-devel
The patch
ASoC: qdsp6: q6afe-dai: add SLIM tx AIF_IN dapm
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
From 0961503412e3e13d82f885f9fb3af527edd58e47 Mon Sep 17 00:00:00 2001
From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Date: Mon, 6 Aug 2018 11:12:09 +0100
Subject: [PATCH] ASoC: qdsp6: q6afe-dai: add SLIM tx AIF_IN dapm
Add missing AIF_IN dapm for slim tx ports.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/qcom/qdsp6/q6afe-dai.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/sound/soc/qcom/qdsp6/q6afe-dai.c b/sound/soc/qcom/qdsp6/q6afe-dai.c
index e988692a3ced..139d24be3fb9 100644
--- a/sound/soc/qcom/qdsp6/q6afe-dai.c
+++ b/sound/soc/qcom/qdsp6/q6afe-dai.c
@@ -1117,6 +1117,13 @@ static const struct snd_soc_dapm_widget q6afe_dai_widgets[] = {
SND_SOC_DAPM_AIF_OUT("SLIMBUS_4_RX", "Slimbus4 Playback", 0, 0, 0, 0),
SND_SOC_DAPM_AIF_OUT("SLIMBUS_5_RX", "Slimbus5 Playback", 0, 0, 0, 0),
SND_SOC_DAPM_AIF_OUT("SLIMBUS_6_RX", "Slimbus6 Playback", 0, 0, 0, 0),
+ SND_SOC_DAPM_AIF_IN("SLIMBUS_0_TX", "Slimbus Capture", 0, 0, 0, 0),
+ SND_SOC_DAPM_AIF_IN("SLIMBUS_1_TX", "Slimbus1 Capture", 0, 0, 0, 0),
+ SND_SOC_DAPM_AIF_IN("SLIMBUS_2_TX", "Slimbus2 Capture", 0, 0, 0, 0),
+ SND_SOC_DAPM_AIF_IN("SLIMBUS_3_TX", "Slimbus3 Capture", 0, 0, 0, 0),
+ SND_SOC_DAPM_AIF_IN("SLIMBUS_4_TX", "Slimbus4 Capture", 0, 0, 0, 0),
+ SND_SOC_DAPM_AIF_IN("SLIMBUS_5_TX", "Slimbus5 Capture", 0, 0, 0, 0),
+ SND_SOC_DAPM_AIF_IN("SLIMBUS_6_TX", "Slimbus6 Capture", 0, 0, 0, 0),
SND_SOC_DAPM_AIF_OUT("QUAT_MI2S_RX", "Quaternary MI2S Playback",
0, 0, 0, 0),
SND_SOC_DAPM_AIF_IN("QUAT_MI2S_TX", "Quaternary MI2S Capture",
--
2.18.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Applied "ASoC: qcom: remove unused header files from common.h" to the asoc tree
2018-08-06 10:12 ` [PATCH 4/5] ASoC: qcom: remove unused header files from common.h Srinivas Kandagatla
@ 2018-08-06 11:50 ` Mark Brown
0 siblings, 0 replies; 11+ messages in thread
From: Mark Brown @ 2018-08-06 11:50 UTC (permalink / raw)
To: Srinivas Kandagatla
Cc: Mark Brown, broonie, lgirdwood, alsa-devel, bgoswami,
linux-kernel, tiwai, vkoul, rohitkr, alsa-devel
The patch
ASoC: qcom: remove unused header files from common.h
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
From d72117d0c89a3f5657ef91d5eef31337964e3cb2 Mon Sep 17 00:00:00 2001
From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Date: Mon, 6 Aug 2018 11:12:08 +0100
Subject: [PATCH] ASoC: qcom: remove unused header files from common.h
This patch removes unused header files from common.h.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/qcom/common.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/sound/soc/qcom/common.h b/sound/soc/qcom/common.h
index ad5d2cf27459..f05c05b12bd7 100644
--- a/sound/soc/qcom/common.h
+++ b/sound/soc/qcom/common.h
@@ -4,7 +4,6 @@
#ifndef __QCOM_SND_COMMON_H__
#define __QCOM_SND_COMMON_H__
-#include <linux/component.h>
#include <sound/soc.h>
int qcom_snd_parse_of(struct snd_soc_card *card);
--
2.18.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Applied "ASoC: sdm845: remove unused header files" to the asoc tree
2018-08-06 10:12 ` [PATCH 3/5] ASoC: sdm845: remove unused header files Srinivas Kandagatla
@ 2018-08-06 11:50 ` Mark Brown
0 siblings, 0 replies; 11+ messages in thread
From: Mark Brown @ 2018-08-06 11:50 UTC (permalink / raw)
To: Srinivas Kandagatla
Cc: Mark Brown, broonie, lgirdwood, alsa-devel, bgoswami,
linux-kernel, tiwai, vkoul, rohitkr, alsa-devel
The patch
ASoC: sdm845: remove unused header files
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
From 846b2c96808cc7cdf4e0619d00604b3edd15b35a Mon Sep 17 00:00:00 2001
From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Date: Mon, 6 Aug 2018 11:12:07 +0100
Subject: [PATCH] ASoC: sdm845: remove unused header files
This patch removes unused header files from the driver.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/qcom/sdm845.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sound/soc/qcom/sdm845.c b/sound/soc/qcom/sdm845.c
index c1adb77230eb..2a781d87ee65 100644
--- a/sound/soc/qcom/sdm845.c
+++ b/sound/soc/qcom/sdm845.c
@@ -5,11 +5,9 @@
#include <linux/module.h>
#include <linux/platform_device.h>
-#include <linux/atomic.h>
#include <linux/of_device.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
-#include <linux/soc/qcom/apr.h>
#include "common.h"
#include "qdsp6/q6afe.h"
--
2.18.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Applied "ASoC: apq8096: remove unused header files" to the asoc tree
2018-08-06 10:12 ` [PATCH 2/5] ASoC: apq8096: remove unused header files Srinivas Kandagatla
@ 2018-08-06 11:50 ` Mark Brown
0 siblings, 0 replies; 11+ messages in thread
From: Mark Brown @ 2018-08-06 11:50 UTC (permalink / raw)
To: Srinivas Kandagatla
Cc: Mark Brown, broonie, lgirdwood, alsa-devel, bgoswami,
linux-kernel, tiwai, vkoul, rohitkr, alsa-devel
The patch
ASoC: apq8096: remove unused header files
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
From e9d244b14dd5cf9a78ab256a4463d946e580ca63 Mon Sep 17 00:00:00 2001
From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Date: Mon, 6 Aug 2018 11:12:06 +0100
Subject: [PATCH] ASoC: apq8096: remove unused header files
This patch removes unused header files from the driver.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/qcom/apq8096.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sound/soc/qcom/apq8096.c b/sound/soc/qcom/apq8096.c
index 6ee7e66cbaaa..1543e85629f8 100644
--- a/sound/soc/qcom/apq8096.c
+++ b/sound/soc/qcom/apq8096.c
@@ -1,9 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
// Copyright (c) 2018, Linaro Limited
-#include <linux/soc/qcom/apr.h>
#include <linux/module.h>
-#include <linux/component.h>
#include <linux/platform_device.h>
#include <linux/of_device.h>
#include <sound/soc.h>
--
2.18.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Applied "ASoC: qcom: make common.c as proper module" to the asoc tree
2018-08-06 10:12 ` [PATCH 1/5] ASoC: qcom: make common.c as proper module Srinivas Kandagatla
@ 2018-08-06 11:51 ` Mark Brown
0 siblings, 0 replies; 11+ messages in thread
From: Mark Brown @ 2018-08-06 11:51 UTC (permalink / raw)
To: Srinivas Kandagatla
Cc: Mark Brown, broonie, lgirdwood, alsa-devel, bgoswami,
linux-kernel, tiwai, vkoul, rohitkr, alsa-devel
The patch
ASoC: qcom: make common.c as proper module
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
From 8e3684f66e15c354dba5544c2af8ce973ed40cf6 Mon Sep 17 00:00:00 2001
From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Date: Mon, 6 Aug 2018 11:12:05 +0100
Subject: [PATCH] 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>
---
sound/soc/qcom/Kconfig | 5 +++++
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
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 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
# 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/
--
2.18.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2018-08-06 11:51 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-06 10:12 [PATCH 0/5] ASoC: qcom: few trival fixes Srinivas Kandagatla
2018-08-06 10:12 ` [PATCH 1/5] ASoC: qcom: make common.c as proper module Srinivas Kandagatla
2018-08-06 11:51 ` Applied "ASoC: qcom: make common.c as proper module" to the asoc tree Mark Brown
2018-08-06 10:12 ` [PATCH 2/5] ASoC: apq8096: remove unused header files Srinivas Kandagatla
2018-08-06 11:50 ` Applied "ASoC: apq8096: remove unused header files" to the asoc tree Mark Brown
2018-08-06 10:12 ` [PATCH 3/5] ASoC: sdm845: remove unused header files Srinivas Kandagatla
2018-08-06 11:50 ` Applied "ASoC: sdm845: remove unused header files" to the asoc tree Mark Brown
2018-08-06 10:12 ` [PATCH 4/5] ASoC: qcom: remove unused header files from common.h Srinivas Kandagatla
2018-08-06 11:50 ` Applied "ASoC: qcom: remove unused header files from common.h" to the asoc tree Mark Brown
2018-08-06 10:12 ` [PATCH 5/5] ASoC: qdsp6: q6afe-dai: add SLIM tx AIF_IN dapm Srinivas Kandagatla
2018-08-06 11:50 ` Applied "ASoC: qdsp6: q6afe-dai: add SLIM tx AIF_IN dapm" to the asoc tree Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).