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>

diff --git a/sound/soc/msm/msm-dai-fe.c b/sound/soc/msm/msm-dai-fe.c
index 44a6a24..a7a25ea 100644 (file)
--- 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 c2ad89a..37b34b2 100644 (file)
--- 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},
 };