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

Commit 008aeacb authored by Gopikrishnaiah Anandan's avatar Gopikrishnaiah Anandan Committed by Stephen Boyd
Browse files

ASoC: wcd9306: Codec changes kernel 3.10 upgrade 



ASoC macros and interface that codec uses have been modified in
kernel 3.10. Change updates the codec driver to use 3.10
asoc macros and interface.

Signed-off-by: default avatarGopikrishnaiah Anandan <agopik@codeaurora.org>
parent eb3893e1

sound/soc/codecs/wcd9306.c

+22 −21
Original line number Diff line number Diff line
@@ -991,26 +991,27 @@ static const struct snd_kcontrol_new tapan_common_snd_controls[] = { 
	SOC_SINGLE_TLV("ADC2 Volume", TAPAN_A_TX_2_EN, 2, 19, 0, analog_gain),

	SOC_SINGLE_TLV("ADC3 Volume", TAPAN_A_TX_3_EN, 2, 19, 0, analog_gain),

	SOC_SINGLE_TLV("ADC4 Volume", TAPAN_A_TX_4_EN, 2, 19, 0, analog_gain),

	SOC_SINGLE_S8_TLV("RX1 Digital Volume", TAPAN_A_CDC_RX1_VOL_CTL_B2_CTL,

		-84, 40, digital_gain),

	SOC_SINGLE_S8_TLV("RX2 Digital Volume", TAPAN_A_CDC_RX2_VOL_CTL_B2_CTL,

		-84, 40, digital_gain),

	SOC_SINGLE_S8_TLV("RX3 Digital Volume", TAPAN_A_CDC_RX3_VOL_CTL_B2_CTL,

		-84, 40, digital_gain),



	SOC_SINGLE_S8_TLV("DEC1 Volume", TAPAN_A_CDC_TX1_VOL_CTL_GAIN, -84, 40,

		digital_gain),

	SOC_SINGLE_S8_TLV("DEC2 Volume", TAPAN_A_CDC_TX2_VOL_CTL_GAIN, -84, 40,

		digital_gain),



	SOC_SINGLE_S8_TLV("IIR1 INP1 Volume", TAPAN_A_CDC_IIR1_GAIN_B1_CTL, -84,

		40, digital_gain),

	SOC_SINGLE_S8_TLV("IIR1 INP2 Volume", TAPAN_A_CDC_IIR1_GAIN_B2_CTL, -84,

		40, digital_gain),

	SOC_SINGLE_S8_TLV("IIR1 INP3 Volume", TAPAN_A_CDC_IIR1_GAIN_B3_CTL, -84,

		40, digital_gain),

	SOC_SINGLE_S8_TLV("IIR1 INP4 Volume", TAPAN_A_CDC_IIR1_GAIN_B4_CTL, -84,

		40, digital_gain),



	SOC_SINGLE_SX_TLV("RX1 Digital Volume", TAPAN_A_CDC_RX1_VOL_CTL_B2_CTL,

		0, -84, 40, digital_gain),

	SOC_SINGLE_SX_TLV("RX2 Digital Volume", TAPAN_A_CDC_RX2_VOL_CTL_B2_CTL,

		0, -84, 40, digital_gain),

	SOC_SINGLE_SX_TLV("RX3 Digital Volume", TAPAN_A_CDC_RX3_VOL_CTL_B2_CTL,

		0, -84, 40, digital_gain),



	SOC_SINGLE_SX_TLV("DEC1 Volume", TAPAN_A_CDC_TX1_VOL_CTL_GAIN,

		0, -84, 40, digital_gain),

	SOC_SINGLE_SX_TLV("DEC2 Volume", TAPAN_A_CDC_TX2_VOL_CTL_GAIN,

		0, -84, 40, digital_gain),



	SOC_SINGLE_SX_TLV("IIR1 INP1 Volume", TAPAN_A_CDC_IIR1_GAIN_B1_CTL,

		0, -84, 40, digital_gain),

	SOC_SINGLE_SX_TLV("IIR1 INP2 Volume", TAPAN_A_CDC_IIR1_GAIN_B2_CTL,

		0, -84, 40, digital_gain),

	SOC_SINGLE_SX_TLV("IIR1 INP3 Volume", TAPAN_A_CDC_IIR1_GAIN_B3_CTL,

		0, -84, 40, digital_gain),

	SOC_SINGLE_SX_TLV("IIR1 INP4 Volume", TAPAN_A_CDC_IIR1_GAIN_B4_CTL,

		0, -84, 40, digital_gain),



	SOC_ENUM("TX1 HPF cut off", cf_dec1_enum),

	SOC_ENUM("TX2 HPF cut off", cf_dec2_enum),
@@ -1672,7 +1673,7 @@ static int slim_rx_mux_put(struct snd_kcontrol *kcontrol, 
	}



rtn:

	snd_soc_dapm_mux_update_power(widget, kcontrol, 1, widget->value, e);

	snd_soc_dapm_mux_update_power(widget, kcontrol, widget->value, e);

	mutex_unlock(&codec->mutex);

	return 0;

err: