Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67f838cc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: Update configs for speaker protection on sdm660"

parents b7fb0e4b b05d6bd9

sound/soc/msm/msm-dai-fe.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

		},

sound/soc/msm/sdm660-internal.c

+1 −1
Original line number Diff line number Diff line
@@ -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},

};