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

Commit 79d5b549 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: Add machine driver support for 32bit capture"

parents 758d0576 e7837516

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

+12 −2
Original line number Diff line number Diff line
@@ -324,7 +324,8 @@ static struct snd_soc_dapm_route wcd9335_audio_paths[] = { 
	{"MIC BIAS4", NULL, "MCLK"},

};



static char const *rx_bit_format_text[] = {"S16_LE", "S24_3LE", "S24_LE"};

static char const *rx_bit_format_text[] = {"S16_LE", "S24_3LE", "S24_LE",

								"S32_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",
@@ -632,6 +633,10 @@ static int mi2s_tx_bit_format_get(struct snd_kcontrol *kcontrol, 
{



	switch (mi2s_tx_bit_format) {

	case SNDRV_PCM_FORMAT_S32_LE:

		ucontrol->value.integer.value[0] = 3;

		break;



	case SNDRV_PCM_FORMAT_S24_LE:

		ucontrol->value.integer.value[0] = 2;

		break;
@@ -657,6 +662,10 @@ static int mi2s_tx_bit_format_put(struct snd_kcontrol *kcontrol, 
	struct snd_ctl_elem_value *ucontrol)

{

	switch (ucontrol->value.integer.value[0]) {

	case 3:

		mi2s_tx_bit_format = SNDRV_PCM_FORMAT_S32_LE;

		tx_bits_per_sample = 32;

		break;

	case 2:

		mi2s_tx_bit_format = SNDRV_PCM_FORMAT_S24_LE;

		tx_bits_per_sample = 32;
@@ -1208,7 +1217,8 @@ static int msm_btsco_rate_put(struct snd_kcontrol *kcontrol, 
}



static const struct soc_enum msm_snd_enum[] = {

	SOC_ENUM_SINGLE_EXT(3, rx_bit_format_text),

	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(rx_bit_format_text),

			rx_bit_format_text),

	SOC_ENUM_SINGLE_EXT(4, mi2s_tx_ch_text),

	SOC_ENUM_SINGLE_EXT(6, pri_rx_sample_rate_text),

	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(tdm_ch_text),

sound/soc/msm/msm8952-slimbus.c

+9 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1042,6 +1042,9 @@ static int slim0_tx_bit_format_get(struct snd_kcontrol *kcontrol, 
			struct snd_ctl_elem_value *ucontrol)

{

	switch (slim0_tx_bit_format) {

	case SNDRV_PCM_FORMAT_S32_LE:

		ucontrol->value.integer.value[0] = 3;

		break;

	case SNDRV_PCM_FORMAT_S24_3LE:

		ucontrol->value.integer.value[0] = 2;

		break;
@@ -1065,6 +1068,9 @@ static int slim0_tx_bit_format_put(struct snd_kcontrol *kcontrol, 
	int rc = 0;



	switch (ucontrol->value.integer.value[0]) {

	case 3:

		slim0_tx_bit_format = SNDRV_PCM_FORMAT_S32_LE;

		break;

	case 2:

		slim0_tx_bit_format = SNDRV_PCM_FORMAT_S24_3LE;

		break;
@@ -1799,7 +1805,8 @@ static const char *const slim4_tx_ch_text[] = {"One", "Two", "Three", "Four", 
						"Five", "Six", "Seven",

						"Eight"};

static const char *const vi_feed_ch_text[] = {"One", "Two"};

static char const *rx_bit_format_text[] = {"S16_LE", "S24_LE", "S24_3LE"};

static char const *rx_bit_format_text[] = {"S16_LE", "S24_LE", "S24_3LE",

								"S32_LE"};

static char const *slim0_rx_sample_rate_text[] = {"KHZ_48", "KHZ_96",

	"KHZ_192", "KHZ_44P1", "KHZ_16"};

static char const *slim4_rx_sample_rate_text[] = {"KHZ_48", "KHZ_96",