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

This project is archived. Its data is read-only.

Commit 4040cfa1 authored Nov 21, 2013 by Damir Didjusto

ASoC: wcd9310: Fix audio playback and capture



Fix the read and write functions which are passing the wrong
parameter to the wcd9xxx helper function.
Fix the virual port amix command for audio capture.
Use a separate structure for each amix command.

Change-Id: I64a7c98d18d99fec515011bed475c78fc8c6d55a
Signed-off-by: Damir Didjusto <damird@codeaurora.org>

parent 1d77d770

sound/soc/codecs/wcd9310.c

+54 −6

Original line number	Diff line number	Diff line
		@@ -2183,7 +2183,53 @@ static const struct snd_kcontrol_new slim_rx_mux[TABLA_RX_MAX] = {
		slim_rx_mux_get, slim_rx_mux_put),
		};

		static const struct snd_kcontrol_new aif_cap_mixer[] = {
		static const struct snd_kcontrol_new aif1_cap_mixer[] = {
		SOC_SINGLE_EXT("SLIM TX1", SND_SOC_NOPM, TABLA_TX1, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		SOC_SINGLE_EXT("SLIM TX2", SND_SOC_NOPM, TABLA_TX2, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		SOC_SINGLE_EXT("SLIM TX3", SND_SOC_NOPM, TABLA_TX3, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		SOC_SINGLE_EXT("SLIM TX4", SND_SOC_NOPM, TABLA_TX4, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		SOC_SINGLE_EXT("SLIM TX5", SND_SOC_NOPM, TABLA_TX5, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		SOC_SINGLE_EXT("SLIM TX6", SND_SOC_NOPM, TABLA_TX6, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		SOC_SINGLE_EXT("SLIM TX7", SND_SOC_NOPM, TABLA_TX7, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		SOC_SINGLE_EXT("SLIM TX8", SND_SOC_NOPM, TABLA_TX8, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		SOC_SINGLE_EXT("SLIM TX9", SND_SOC_NOPM, TABLA_TX9, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		SOC_SINGLE_EXT("SLIM TX10", SND_SOC_NOPM, TABLA_TX10, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		};

		static const struct snd_kcontrol_new aif2_cap_mixer[] = {
		SOC_SINGLE_EXT("SLIM TX1", SND_SOC_NOPM, TABLA_TX1, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		SOC_SINGLE_EXT("SLIM TX2", SND_SOC_NOPM, TABLA_TX2, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		SOC_SINGLE_EXT("SLIM TX3", SND_SOC_NOPM, TABLA_TX3, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		SOC_SINGLE_EXT("SLIM TX4", SND_SOC_NOPM, TABLA_TX4, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		SOC_SINGLE_EXT("SLIM TX5", SND_SOC_NOPM, TABLA_TX5, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		SOC_SINGLE_EXT("SLIM TX6", SND_SOC_NOPM, TABLA_TX6, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		SOC_SINGLE_EXT("SLIM TX7", SND_SOC_NOPM, TABLA_TX7, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		SOC_SINGLE_EXT("SLIM TX8", SND_SOC_NOPM, TABLA_TX8, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		SOC_SINGLE_EXT("SLIM TX9", SND_SOC_NOPM, TABLA_TX9, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		SOC_SINGLE_EXT("SLIM TX10", SND_SOC_NOPM, TABLA_TX10, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		};

		static const struct snd_kcontrol_new aif3_cap_mixer[] = {
		SOC_SINGLE_EXT("SLIM TX1", SND_SOC_NOPM, TABLA_TX1, 1, 0,
		slim_tx_mixer_get, slim_tx_mixer_put),
		SOC_SINGLE_EXT("SLIM TX2", SND_SOC_NOPM, TABLA_TX2, 1, 0,
		@@ -4427,6 +4473,7 @@ static int tabla_write(struct snd_soc_codec *codec, unsigned int reg,
		unsigned int value)
		{
		int ret;
		struct wcd9xxx *wcd9xxx = codec->control_data;

		if (reg == SND_SOC_NOPM)
		return 0;
		@@ -4440,13 +4487,14 @@ static int tabla_write(struct snd_soc_codec *codec, unsigned int reg,
		reg, ret);
		}

		return wcd9xxx_reg_write(codec->control_data, reg, value);
		return wcd9xxx_reg_write(&wcd9xxx->core_res, reg, value);
		}
		static unsigned int tabla_read(struct snd_soc_codec *codec,
		unsigned int reg)
		{
		unsigned int val;
		int ret;
		struct wcd9xxx *wcd9xxx = codec->control_data;

		if (reg == SND_SOC_NOPM)
		return 0;
		@@ -4463,7 +4511,7 @@ static unsigned int tabla_read(struct snd_soc_codec *codec,
		reg, ret);
		}

		val = wcd9xxx_reg_read(codec->control_data, reg);
		val = wcd9xxx_reg_read(&wcd9xxx->core_res, reg);
		return val;
		}

		@@ -5697,13 +5745,13 @@ static const struct snd_soc_dapm_widget tabla_dapm_widgets[] = {
		SND_SOC_DAPM_POST_PMU \| SND_SOC_DAPM_POST_PMD),

		SND_SOC_DAPM_MIXER("AIF1_CAP Mixer", SND_SOC_NOPM, AIF1_CAP, 0,
		aif_cap_mixer, ARRAY_SIZE(aif_cap_mixer)),
		aif1_cap_mixer, ARRAY_SIZE(aif1_cap_mixer)),

		SND_SOC_DAPM_MIXER("AIF2_CAP Mixer", SND_SOC_NOPM, AIF2_CAP, 0,
		aif_cap_mixer, ARRAY_SIZE(aif_cap_mixer)),
		aif2_cap_mixer, ARRAY_SIZE(aif2_cap_mixer)),

		SND_SOC_DAPM_MIXER("AIF3_CAP Mixer", SND_SOC_NOPM, AIF3_CAP, 0,
		aif_cap_mixer, ARRAY_SIZE(aif_cap_mixer)),
		aif3_cap_mixer, ARRAY_SIZE(aif3_cap_mixer)),

		SND_SOC_DAPM_MUX("SLIM TX1 MUX", SND_SOC_NOPM, TABLA_TX1, 0,
		&sb_tx1_mux),