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

Commit 0cee4db2 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/ac97', 'asoc/fix/atmel',... 

Merge remote-tracking branches 'asoc/fix/ac97', 'asoc/fix/atmel', 'asoc/fix/intel', 'asoc/fix/rt286', 'asoc/fix/rt5640', 'asoc/fix/samsung', 'asoc/fix/sgtl5000', 'asoc/fix/sta32x', 'asoc/fix/tlv320aic3x' and 'asoc/fix/wm8731' into asoc-linus
parents b34510b7 f8d71be5 20cf2603 279e17ae 28d1ad09 3463667a fddcd300 58cc9c9a b0402717 0b65ba99 8a6cf30b

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -4953,6 +4953,16 @@ F: Documentation/input/multi-touch-protocol.txt 
F:	drivers/input/input-mt.c

K:	\b(ABS|SYN)_MT_



INTEL ASoC BDW/HSW DRIVERS

M:	Jie Yang <yang.jie@linux.intel.com>

L:	alsa-devel@alsa-project.org

S:	Supported

F:	sound/soc/intel/sst-haswell*

F:	sound/soc/intel/sst-dsp*

F:	sound/soc/intel/sst-firmware.c

F:	sound/soc/intel/broadwell.c

F:	sound/soc/intel/haswell.c



INTEL C600 SERIES SAS CONTROLLER DRIVER

M:	Intel SCU Linux support <intel-linux-scu@intel.com>

M:	Artur Paszkiewicz <artur.paszkiewicz@intel.com>

arch/arm/boot/dts/exynos4.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ 
	};



	i2s1: i2s@13960000 {

		compatible = "samsung,s5pv210-i2s";

		compatible = "samsung,s3c6410-i2s";

		reg = <0x13960000 0x100>;

		clocks = <&clock CLK_I2S1>;

		clock-names = "iis";
@@ -378,7 +378,7 @@ 
	};



	i2s2: i2s@13970000 {

		compatible = "samsung,s5pv210-i2s";

		compatible = "samsung,s3c6410-i2s";

		reg = <0x13970000 0x100>;

		clocks = <&clock CLK_I2S2>;

		clock-names = "iis";

include/sound/soc.h

+1 −0
Original line number Diff line number Diff line
@@ -498,6 +498,7 @@ int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned int reg, 
				unsigned int mask, unsigned int value);



#ifdef CONFIG_SND_SOC_AC97_BUS

struct snd_ac97 *snd_soc_alloc_ac97_codec(struct snd_soc_codec *codec);

struct snd_ac97 *snd_soc_new_ac97_codec(struct snd_soc_codec *codec);

void snd_soc_free_ac97_codec(struct snd_ac97 *ac97);

sound/soc/atmel/atmel_ssc_dai.c

+7 −17
Original line number Diff line number Diff line
@@ -348,7 +348,6 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, 
	struct atmel_pcm_dma_params *dma_params;

	int dir, channels, bits;

	u32 tfmr, rfmr, tcmr, rcmr;

	int start_event;

	int ret;

	int fslen, fslen_ext;
@@ -457,19 +456,10 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, 
		 * The SSC transmit clock is obtained from the BCLK signal on

		 * on the TK line, and the SSC receive clock is

		 * generated from the transmit clock.

		 *

		 *  For single channel data, one sample is transferred

		 * on the falling edge of the LRC clock.

		 * For two channel data, one sample is

		 * transferred on both edges of the LRC clock.

		 */

		start_event = ((channels == 1)

				? SSC_START_FALLING_RF

				: SSC_START_EDGE_RF);



		rcmr =	  SSC_BF(RCMR_PERIOD, 0)

			| SSC_BF(RCMR_STTDLY, START_DELAY)

			| SSC_BF(RCMR_START, start_event)

			| SSC_BF(RCMR_START, SSC_START_FALLING_RF)

			| SSC_BF(RCMR_CKI, SSC_CKI_RISING)

			| SSC_BF(RCMR_CKO, SSC_CKO_NONE)

			| SSC_BF(RCMR_CKS, ssc->clk_from_rk_pin ?
@@ -478,14 +468,14 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, 
		rfmr =	  SSC_BF(RFMR_FSEDGE, SSC_FSEDGE_POSITIVE)

			| SSC_BF(RFMR_FSOS, SSC_FSOS_NONE)

			| SSC_BF(RFMR_FSLEN, 0)

			| SSC_BF(RFMR_DATNB, 0)

			| SSC_BF(RFMR_DATNB, (channels - 1))

			| SSC_BIT(RFMR_MSBF)

			| SSC_BF(RFMR_LOOP, 0)

			| SSC_BF(RFMR_DATLEN, (bits - 1));



		tcmr =	  SSC_BF(TCMR_PERIOD, 0)

			| SSC_BF(TCMR_STTDLY, START_DELAY)

			| SSC_BF(TCMR_START, start_event)

			| SSC_BF(TCMR_START, SSC_START_FALLING_RF)

			| SSC_BF(TCMR_CKI, SSC_CKI_FALLING)

			| SSC_BF(TCMR_CKO, SSC_CKO_NONE)

			| SSC_BF(TCMR_CKS, ssc->clk_from_rk_pin ?
@@ -495,7 +485,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, 
			| SSC_BF(TFMR_FSDEN, 0)

			| SSC_BF(TFMR_FSOS, SSC_FSOS_NONE)

			| SSC_BF(TFMR_FSLEN, 0)

			| SSC_BF(TFMR_DATNB, 0)

			| SSC_BF(TFMR_DATNB, (channels - 1))

			| SSC_BIT(TFMR_MSBF)

			| SSC_BF(TFMR_DATDEF, 0)

			| SSC_BF(TFMR_DATLEN, (bits - 1));
@@ -512,7 +502,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, 
		rcmr =	  SSC_BF(RCMR_PERIOD, ssc_p->rcmr_period)

			| SSC_BF(RCMR_STTDLY, 1)

			| SSC_BF(RCMR_START, SSC_START_RISING_RF)

			| SSC_BF(RCMR_CKI, SSC_CKI_RISING)

			| SSC_BF(RCMR_CKI, SSC_CKI_FALLING)

			| SSC_BF(RCMR_CKO, SSC_CKO_NONE)

			| SSC_BF(RCMR_CKS, SSC_CKS_DIV);
@@ -527,7 +517,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, 
		tcmr =	  SSC_BF(TCMR_PERIOD, ssc_p->tcmr_period)

			| SSC_BF(TCMR_STTDLY, 1)

			| SSC_BF(TCMR_START, SSC_START_RISING_RF)

			| SSC_BF(TCMR_CKI, SSC_CKI_RISING)

			| SSC_BF(TCMR_CKI, SSC_CKI_FALLING)

			| SSC_BF(TCMR_CKO, SSC_CKO_CONTINUOUS)

			| SSC_BF(TCMR_CKS, SSC_CKS_DIV);
@@ -556,7 +546,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, 
		rcmr =	  SSC_BF(RCMR_PERIOD, 0)

			| SSC_BF(RCMR_STTDLY, START_DELAY)

			| SSC_BF(RCMR_START, SSC_START_RISING_RF)

			| SSC_BF(RCMR_CKI, SSC_CKI_RISING)

			| SSC_BF(RCMR_CKI, SSC_CKI_FALLING)

			| SSC_BF(RCMR_CKO, SSC_CKO_NONE)

			| SSC_BF(RCMR_CKS, ssc->clk_from_rk_pin ?

					   SSC_CKS_PIN : SSC_CKS_CLOCK);

sound/soc/codecs/rt286.c

+8 −32
Original line number Diff line number Diff line
@@ -305,6 +305,8 @@ static int rt286_jack_detect(struct rt286_priv *rt286, bool *hp, bool *mic) 
	*hp = false;

	*mic = false;



	if (!rt286->codec)

		return -EINVAL;

	if (rt286->pdata.cbj_en) {

		regmap_read(rt286->regmap, RT286_GET_HP_SENSE, &buf);

		*hp = buf & 0x80000000;
@@ -417,6 +419,8 @@ static const DECLARE_TLV_DB_SCALE(mic_vol_tlv, 0, 1000, 0); 
static const struct snd_kcontrol_new rt286_snd_controls[] = {

	SOC_DOUBLE_R_TLV("DAC0 Playback Volume", RT286_DACL_GAIN,

			    RT286_DACR_GAIN, 0, 0x7f, 0, out_vol_tlv),

	SOC_DOUBLE_R("ADC0 Capture Switch", RT286_ADCL_GAIN,

			    RT286_ADCR_GAIN, 7, 1, 1),

	SOC_DOUBLE_R_TLV("ADC0 Capture Volume", RT286_ADCL_GAIN,

			    RT286_ADCR_GAIN, 0, 0x7f, 0, out_vol_tlv),

	SOC_SINGLE_TLV("AMIC Volume", RT286_MIC_GAIN,
@@ -538,32 +542,6 @@ static int rt286_set_dmic1_event(struct snd_soc_dapm_widget *w, 
	return 0;

}



static int rt286_adc_event(struct snd_soc_dapm_widget *w,

			     struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = w->codec;

	unsigned int nid;



	nid = (w->reg >> 20) & 0xff;



	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

		snd_soc_update_bits(codec,

			VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, nid, 0),

			0x7080, 0x7000);

		break;

	case SND_SOC_DAPM_PRE_PMD:

		snd_soc_update_bits(codec,

			VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, nid, 0),

			0x7080, 0x7080);

		break;

	default:

		return 0;

	}



	return 0;

}



static int rt286_vref_event(struct snd_soc_dapm_widget *w,

			     struct snd_kcontrol *kcontrol, int event)

{
@@ -667,12 +645,10 @@ static const struct snd_soc_dapm_widget rt286_dapm_widgets[] = { 
	SND_SOC_DAPM_ADC("ADC 1", NULL, SND_SOC_NOPM, 0, 0),



	/* ADC Mux */

	SND_SOC_DAPM_MUX_E("ADC 0 Mux", RT286_SET_POWER(RT286_ADC_IN1), 0, 1,

		&rt286_adc0_mux, rt286_adc_event, SND_SOC_DAPM_PRE_PMD |

		SND_SOC_DAPM_POST_PMU),

	SND_SOC_DAPM_MUX_E("ADC 1 Mux", RT286_SET_POWER(RT286_ADC_IN2), 0, 1,

		&rt286_adc1_mux, rt286_adc_event, SND_SOC_DAPM_PRE_PMD |

		SND_SOC_DAPM_POST_PMU),

	SND_SOC_DAPM_MUX("ADC 0 Mux", RT286_SET_POWER(RT286_ADC_IN1), 0, 1,

		&rt286_adc0_mux),

	SND_SOC_DAPM_MUX("ADC 1 Mux", RT286_SET_POWER(RT286_ADC_IN2), 0, 1,

		&rt286_adc1_mux),



	/* Audio Interface */

	SND_SOC_DAPM_AIF_IN("AIF1RX", "AIF1 Playback", 0, SND_SOC_NOPM, 0, 0),