summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaxminath Kasam <lkasam@codeaurora.org>2017-02-23 20:41:15 +0530
committerLaxminath Kasam <lkasam@codeaurora.org>2017-02-24 19:39:53 +0530
commitb05d6bd9aa2af37c103740920b667c81b98ff92c (patch)
tree7f8a22bdcbf26b69f4efc8a7feadd0a8c48bb18e
parentac0a983daec732ad6d732683d44d8d69e521afb8 (diff)
ASoC: msm: Update configs for speaker protection on sdm660
In speaker protection config, default setting uses 4 channels for RX. Update INT4_MI2S hostless session config with 4 channels to match with speaker protection config and avoid hw params failure. As soundwire codec VI sense capture can support 8k and 48k sampling rates, use 48k sample rate as V/I sense data captured is in sync with playback data with this sampling rate. CRs-Fixed: 2003278 Change-Id: I60e3a541096658e28862de70f59ee11b119e37ce Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
-rw-r--r--sound/soc/msm/msm-dai-fe.c2
-rw-r--r--sound/soc/msm/sdm660-internal.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/msm/msm-dai-fe.c b/sound/soc/msm/msm-dai-fe.c
index 44a6a245c7a2..a7a25ea070da 100644
--- a/sound/soc/msm/msm-dai-fe.c
+++ b/sound/soc/msm/msm-dai-fe.c
@@ -964,7 +964,7 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
.formats = (SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_S24_LE),
.channels_min = 1,
- .channels_max = 2,
+ .channels_max = 4,
.rate_min = 8000,
.rate_max = 192000,
},
diff --git a/sound/soc/msm/sdm660-internal.c b/sound/soc/msm/sdm660-internal.c
index c2ad89a69dbb..37b34b231b72 100644
--- a/sound/soc/msm/sdm660-internal.c
+++ b/sound/soc/msm/sdm660-internal.c
@@ -136,7 +136,7 @@ static struct dev_config int_mi2s_cfg[] = {
[INT2_MI2S] = {SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 1},
[INT3_MI2S] = {SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 1},
[INT4_MI2S] = {SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 1},
- [INT5_MI2S] = {SAMPLING_RATE_8KHZ, SNDRV_PCM_FORMAT_S16_LE, 2},
+ [INT5_MI2S] = {SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 2},
[INT6_MI2S] = {SAMPLING_RATE_8KHZ, SNDRV_PCM_FORMAT_S16_LE, 2},
};