Merge "ASoc: msm: Update apq8009 machine driver" (770a8af7) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/msm/apq8009-i2s-ext-codec.c

+10 −2

Original line number	Diff line number	Diff line
		@@ -280,7 +280,7 @@ static struct snd_soc_dapm_route wcd9335_audio_paths[] = {
		{"MIC BIAS4", NULL, "MCLK"},
		};

		static char const *rx_bit_format_text[] = {"S16_LE", "S24_LE"};
		static char const *rx_bit_format_text[] = {"S16_LE", "S24_3LE", "S24_LE"};
		static const char *const mi2s_tx_ch_text[] = {"One", "Two", "Three", "Four"};
		static char const *pri_rx_sample_rate_text[] = {"KHZ_48", "KHZ_96",
		"KHZ_192", "KHZ_8",
		@@ -340,6 +340,10 @@ static int mi2s_rx_bit_format_get(struct snd_kcontrol *kcontrol,

		switch (mi2s_rx_bit_format) {
		case SNDRV_PCM_FORMAT_S24_LE:
		ucontrol->value.integer.value[0] = 2;
		break;

		case SNDRV_PCM_FORMAT_S24_3LE:
		ucontrol->value.integer.value[0] = 1;
		break;

		@@ -360,10 +364,14 @@ static int mi2s_rx_bit_format_put(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		switch (ucontrol->value.integer.value[0]) {
		case 1:
		case 2:
		mi2s_rx_bit_format = SNDRV_PCM_FORMAT_S24_LE;
		bits_per_sample = 32;
		break;
		case 1:
		mi2s_rx_bit_format = SNDRV_PCM_FORMAT_S24_3LE;
		bits_per_sample = 32;
		break;
		case 0:
		default:
		mi2s_rx_bit_format = SNDRV_PCM_FORMAT_S16_LE;