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

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

Merge "apq8074:audio: Support up to eight TX and RX channels"

parents 0f059515 43a8ec17

sound/soc/msm/apq8074.c

+3 −2
Original line number Diff line number Diff line
@@ -659,7 +659,8 @@ static const struct snd_soc_dapm_widget apq8074_dapm_widgets[] = { 
static const char *const spk_function[] = {"Off", "On"};

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

static const char *const slim0_tx_ch_text[] = {"One", "Two", "Three", "Four",

						"Five"};

						"Five", "Six", "Seven",

						"Eight"};

static char const *hdmi_rx_ch_text[] = {"Two", "Three", "Four", "Five",

					"Six", "Seven", "Eight"};

static char const *rx_bit_format_text[] = {"S16_LE", "S24_LE"};
@@ -1200,7 +1201,7 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
static const struct soc_enum msm_snd_enum[] = {

	SOC_ENUM_SINGLE_EXT(2, spk_function),

	SOC_ENUM_SINGLE_EXT(2, slim0_rx_ch_text),

	SOC_ENUM_SINGLE_EXT(5, slim0_tx_ch_text),

	SOC_ENUM_SINGLE_EXT(8, slim0_tx_ch_text),

	SOC_ENUM_SINGLE_EXT(7, hdmi_rx_ch_text),

	SOC_ENUM_SINGLE_EXT(2, rx_bit_format_text),

	SOC_ENUM_SINGLE_EXT(3, slim0_rx_sample_rate_text),