diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-25 19:49:32 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-25 19:49:31 -0800 |
| commit | 67f838cce1873f18b79c4716120e24b82ddedcd8 (patch) | |
| tree | e3349ee5a30ef07297aa1a181294e9db62c5dea4 | |
| parent | b7fb0e4bdf5bbaa555d2cec03ef3ce4fc600d8c9 (diff) | |
| parent | b05d6bd9aa2af37c103740920b667c81b98ff92c (diff) | |
Merge "ASoC: msm: Update configs for speaker protection on sdm660"
| -rw-r--r-- | sound/soc/msm/msm-dai-fe.c | 2 | ||||
| -rw-r--r-- | sound/soc/msm/sdm660-internal.c | 2 |
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}, }; |