Unverified Commit 16a077e1 authored by Mark Brown's avatar Mark Brown
Browse files

Merge tag 'asoc-fix-v4.14-rc6' into asoc-linus 

ASoC: Fixes for v4.14

I've been quite lax in sending these due to conference season but here's
a fairly large collection of ASoC updates.  The one thing that's not
device specific is Takashi's fix for races between delayed work and PCM
destruction, otherwise everything is specific to an individual device.

# gpg: Signature made Thu 26 Oct 2017 15:11:23 BST
# gpg:                using RSA key ADE668AA675718B59FE29FEA24D68B725D5487D0
# gpg:                issuer "broonie@kernel.org"
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>" [unknown]
# gpg:                 aka "Mark Brown <broonie@debian.org>" [unknown]
# gpg:                 aka "Mark Brown <broonie@kernel.org>" [unknown]
# gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>" [unknown]
# gpg:                 aka "Mark Brown <broonie@linaro.org>" [unknown]
# gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 3F25 68AA C269 98F9 E813  A1C5 C3F4 36CA 30F5 D8EB
#      Subkey fingerprint: ADE6 68AA 6757 18B5 9FE2  9FEA 24D6 8B72 5D54 87D0
parents 39dae59d 0bebd2f1

sound/soc/codecs/max98090.c

+1 −1
Original line number Diff line number Diff line
@@ -2115,7 +2115,7 @@ static void max98090_pll_work(struct work_struct *work) 
	if (!snd_soc_codec_is_active(codec))

		return;



	dev_info(codec->dev, "PLL unlocked\n");

	dev_info_ratelimited(codec->dev, "PLL unlocked\n");



	/* Toggle shutdown OFF then ON */

	snd_soc_update_bits(codec, M98090_REG_DEVICE_SHUTDOWN,

sound/soc/codecs/msm8916-wcd-analog.c

+4 −3
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ 
#define CDC_A_MICB_1_VAL		(0xf141)

#define MICB_MIN_VAL 1600

#define MICB_STEP_SIZE 50

#define MICB_VOLTAGE_REGVAL(v)		((v - MICB_MIN_VAL)/MICB_STEP_SIZE)

#define MICB_VOLTAGE_REGVAL(v)		(((v - MICB_MIN_VAL)/MICB_STEP_SIZE) << 3)

#define MICB_1_VAL_MICB_OUT_VAL_MASK	GENMASK(7, 3)

#define MICB_1_VAL_MICB_OUT_VAL_V2P70V	((0x16)  << 3)

#define MICB_1_VAL_MICB_OUT_VAL_V1P80V	((0x4)  << 3)
@@ -349,7 +349,8 @@ static void pm8916_wcd_analog_micbias_enable(struct snd_soc_codec *codec) 
			    | MICB_1_CTL_EXT_PRECHARG_EN_ENABLE);



	if (wcd->micbias_mv) {

		snd_soc_write(codec, CDC_A_MICB_1_VAL,

		snd_soc_update_bits(codec, CDC_A_MICB_1_VAL,

				    MICB_1_VAL_MICB_OUT_VAL_MASK,

				    MICB_VOLTAGE_REGVAL(wcd->micbias_mv));

		/*

		 * Special headset needs MICBIAS as 2.7V so wait for

sound/soc/codecs/msm8916-wcd-digital.c

+2 −2
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static const struct soc_enum rx_mix2_inp1_chain_enum = SOC_ENUM_SINGLE( 
static const struct soc_enum rx2_mix1_inp_enum[] = {

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B1_CTL, 0, 6, rx_mix1_text),

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B1_CTL, 3, 6, rx_mix1_text),

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B1_CTL, 0, 6, rx_mix1_text),

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B2_CTL, 0, 6, rx_mix1_text),

};



/* RX2 MIX2 */
@@ -249,7 +249,7 @@ static const struct soc_enum rx2_mix2_inp1_chain_enum = SOC_ENUM_SINGLE( 
static const struct soc_enum rx3_mix1_inp_enum[] = {

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B1_CTL, 0, 6, rx_mix1_text),

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B1_CTL, 3, 6, rx_mix1_text),

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B1_CTL, 0, 6, rx_mix1_text),

	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B2_CTL, 0, 6, rx_mix1_text),

};



/* DEC */

sound/soc/codecs/wm8998.c

+19 −65
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static int wm8998_asrc_ev(struct snd_soc_dapm_widget *w, 
	return 0;

}



static int wm8998_in1mux_put(struct snd_kcontrol *kcontrol,

static int wm8998_inmux_put(struct snd_kcontrol *kcontrol,

			    struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_soc_dapm_kcontrol_codec(kcontrol);
@@ -109,84 +109,38 @@ static int wm8998_in1mux_put(struct snd_kcontrol *kcontrol, 
	struct wm8998_priv *wm8998 = snd_soc_codec_get_drvdata(codec);

	struct arizona *arizona = wm8998->core.arizona;

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	unsigned int mux, inmode;

	unsigned int mode_val, src_val;

	unsigned int mode_reg, mode_index;

	unsigned int mux, inmode, src_val, mode_val;



	mux = ucontrol->value.enumerated.item[0];

	if (mux > 1)

		return -EINVAL;



	/* L and R registers have same shift and mask */

	inmode = arizona->pdata.inmode[2 * mux];

	src_val = mux << ARIZONA_IN1L_SRC_SHIFT;

	if (inmode & ARIZONA_INMODE_SE)

		src_val |= 1 << ARIZONA_IN1L_SRC_SE_SHIFT;



	switch (arizona->pdata.inmode[0]) {

	case ARIZONA_INMODE_DMIC:

		if (mux)

			mode_val = 0;	/* B always analogue */

		else

			mode_val = 1 << ARIZONA_IN1_MODE_SHIFT;



		snd_soc_update_bits(codec, ARIZONA_IN1L_CONTROL,

				    ARIZONA_IN1_MODE_MASK, mode_val);



		/* IN1A is digital so L and R must change together */

		/* src_val setting same for both registers */

		snd_soc_update_bits(codec,

				    ARIZONA_ADC_DIGITAL_VOLUME_1L,

				    ARIZONA_IN1L_SRC_MASK |

				    ARIZONA_IN1L_SRC_SE_MASK, src_val);

		snd_soc_update_bits(codec,

				    ARIZONA_ADC_DIGITAL_VOLUME_1R,

				    ARIZONA_IN1R_SRC_MASK |

				    ARIZONA_IN1R_SRC_SE_MASK, src_val);

	switch (e->reg) {

	case ARIZONA_ADC_DIGITAL_VOLUME_2L:

		mode_reg = ARIZONA_IN2L_CONTROL;

		mode_index = 1 + (2 * mux);

		break;

	default:

		/* both analogue */

		snd_soc_update_bits(codec,

				    e->reg,

				    ARIZONA_IN1L_SRC_MASK |

				    ARIZONA_IN1L_SRC_SE_MASK,

				    src_val);

		mode_reg = ARIZONA_IN1L_CONTROL;

		mode_index = (2 * mux);

		break;

	}



	return snd_soc_dapm_mux_update_power(dapm, kcontrol,

					     ucontrol->value.enumerated.item[0],

					     e, NULL);

}



static int wm8998_in2mux_put(struct snd_kcontrol *kcontrol,

			    struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_soc_dapm_kcontrol_codec(kcontrol);

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct wm8998_priv *wm8998 = snd_soc_codec_get_drvdata(codec);

	struct arizona *arizona = wm8998->core.arizona;

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	unsigned int mux, inmode, src_val, mode_val;



	mux = ucontrol->value.enumerated.item[0];

	if (mux > 1)

		return -EINVAL;



	inmode = arizona->pdata.inmode[1 + (2 * mux)];

	inmode = arizona->pdata.inmode[mode_index];

	if (inmode & ARIZONA_INMODE_DMIC)

		mode_val = 1 << ARIZONA_IN2_MODE_SHIFT;

		mode_val = 1 << ARIZONA_IN1_MODE_SHIFT;

	else

		mode_val = 0;



	src_val = mux << ARIZONA_IN2L_SRC_SHIFT;

	src_val = mux << ARIZONA_IN1L_SRC_SHIFT;

	if (inmode & ARIZONA_INMODE_SE)

		src_val |= 1 << ARIZONA_IN2L_SRC_SE_SHIFT;

		src_val |= 1 << ARIZONA_IN1L_SRC_SE_SHIFT;



	snd_soc_update_bits(codec, ARIZONA_IN2L_CONTROL,

			    ARIZONA_IN2_MODE_MASK, mode_val);

	snd_soc_update_bits(codec, mode_reg, ARIZONA_IN1_MODE_MASK, mode_val);



	snd_soc_update_bits(codec, ARIZONA_ADC_DIGITAL_VOLUME_2L,

			    ARIZONA_IN2L_SRC_MASK | ARIZONA_IN2L_SRC_SE_MASK,

	snd_soc_update_bits(codec, e->reg,

			    ARIZONA_IN1L_SRC_MASK | ARIZONA_IN1L_SRC_SE_MASK,

			    src_val);



	return snd_soc_dapm_mux_update_power(dapm, kcontrol,
@@ -216,14 +170,14 @@ static SOC_ENUM_SINGLE_DECL(wm8998_in2mux_enum, 


static const struct snd_kcontrol_new wm8998_in1mux[2] = {

	SOC_DAPM_ENUM_EXT("IN1L Mux", wm8998_in1muxl_enum,

			  snd_soc_dapm_get_enum_double, wm8998_in1mux_put),

			  snd_soc_dapm_get_enum_double, wm8998_inmux_put),

	SOC_DAPM_ENUM_EXT("IN1R Mux", wm8998_in1muxr_enum,

			  snd_soc_dapm_get_enum_double, wm8998_in1mux_put),

			  snd_soc_dapm_get_enum_double, wm8998_inmux_put),

};



static const struct snd_kcontrol_new wm8998_in2mux =

	SOC_DAPM_ENUM_EXT("IN2 Mux", wm8998_in2mux_enum,

			  snd_soc_dapm_get_enum_double, wm8998_in2mux_put);

			  snd_soc_dapm_get_enum_double, wm8998_inmux_put);



static DECLARE_TLV_DB_SCALE(ana_tlv, 0, 100, 0);

static DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0);

sound/soc/davinci/davinci-mcasp.c

+4 −2
Original line number Diff line number Diff line
@@ -1982,8 +1982,10 @@ static int davinci_mcasp_probe(struct platform_device *pdev) 
			     GFP_KERNEL);



	if (!mcasp->chconstr[SNDRV_PCM_STREAM_PLAYBACK].list ||

	    !mcasp->chconstr[SNDRV_PCM_STREAM_CAPTURE].list)

		return -ENOMEM;

	    !mcasp->chconstr[SNDRV_PCM_STREAM_CAPTURE].list) {

		ret = -ENOMEM;

		goto err;

	}



	ret = davinci_mcasp_set_ch_constraints(mcasp);

	if (ret)

CRA Git | Maintained and supported by SUSTech CRA and CCSE