asoc: Expose mixer control to set noirq capture volume
NOIRQ platform driver registers volume controls for playback
with ALSA control module. Extend this for capture stream as well.
CRs-Fixed: 2222250
Change-Id: I04a3bfe0a8f44b5cb7b8f24d05cf6d72dabf1fd9
Signed-off-by: Haynes Mathew George <hgeorge@codeaurora.org>
Signed-off-by: Karthikeyan Mani <kmani@codeaurora.org>
diff --git a/asoc/msm-pcm-q6-v2.c b/asoc/msm-pcm-q6-v2.c
index a087dd8..b010010 100644
--- a/asoc/msm-pcm-q6-v2.c
+++ b/asoc/msm-pcm-q6-v2.c
@@ -1391,7 +1391,7 @@
{
struct snd_pcm_volume *vol = snd_kcontrol_chip(kcontrol);
struct snd_pcm_substream *substream =
- vol->pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
+ vol->pcm->streams[vol->stream].substream;
struct msm_audio *prtd;
pr_debug("%s\n", __func__);
@@ -1415,7 +1415,7 @@
int rc = 0;
struct snd_pcm_volume *vol = snd_kcontrol_chip(kcontrol);
struct snd_pcm_substream *substream =
- vol->pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
+ vol->pcm->streams[vol->stream].substream;
struct msm_audio *prtd;
int volume = ucontrol->value.integer.value[0];
@@ -1436,15 +1436,16 @@
return rc;
}
-static int msm_pcm_add_volume_control(struct snd_soc_pcm_runtime *rtd)
+static int msm_pcm_add_volume_control(struct snd_soc_pcm_runtime *rtd,
+ int stream)
{
int ret = 0;
struct snd_pcm *pcm = rtd->pcm;
struct snd_pcm_volume *volume_info;
struct snd_kcontrol *kctl;
- dev_dbg(rtd->dev, "%s, Volume control add\n", __func__);
- ret = snd_pcm_add_volume_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,
+ dev_dbg(rtd->dev, "%s, volume control add\n", __func__);
+ ret = snd_pcm_add_volume_ctls(pcm, stream,
NULL, 1, rtd->dai_link->id,
&volume_info);
if (ret < 0) {
@@ -2575,11 +2576,14 @@
return ret;
}
- ret = msm_pcm_add_volume_control(rtd);
+ ret = msm_pcm_add_volume_control(rtd, SNDRV_PCM_STREAM_PLAYBACK);
if (ret)
pr_err("%s: Could not add pcm Volume Control %d\n",
__func__, ret);
-
+ ret = msm_pcm_add_volume_control(rtd, SNDRV_PCM_STREAM_CAPTURE);
+ if (ret)
+ pr_err("%s: Could not add pcm Volume Control %d\n",
+ __func__, ret);
ret = msm_pcm_add_compress_control(rtd);
if (ret)
pr_err("%s: Could not add pcm Compress Control %d\n",