Commit cff78735 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus 

ASoC: updates for 3.4

Slightly larger than normal - the DAPM fix is a "this should always have
worked" type of thing which is very clear and should have no impact on
systems that don't need it.  The WM8994 fix is driver specific but
pretty important for that driver.
parents 5ac57550 1a38336b

sound/soc/codecs/cs42l73.c

+2 −0
Original line number Diff line number Diff line
@@ -929,6 +929,8 @@ static int cs42l73_set_mclk(struct snd_soc_dai *dai, unsigned int freq) 


	/* MCLKX -> MCLK */

	mclkx_coeff = cs42l73_get_mclkx_coeff(freq);

	if (mclkx_coeff < 0)

		return mclkx_coeff;



	mclk = cs42l73_mclkx_coeffs[mclkx_coeff].mclkx /

		cs42l73_mclkx_coeffs[mclkx_coeff].ratio;

sound/soc/codecs/wm8994.c

+222 −54
Original line number Diff line number Diff line
@@ -1000,60 +1000,169 @@ static void wm8994_update_class_w(struct snd_soc_codec *codec) 
	}

}



static int late_enable_ev(struct snd_soc_dapm_widget *w,

static int aif1clk_ev(struct snd_soc_dapm_widget *w,

		      struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = w->codec;

	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);

	struct wm8994 *control = codec->control_data;

	int mask = WM8994_AIF1DAC1L_ENA | WM8994_AIF1DAC1R_ENA;

	int dac;

	int adc;

	int val;



	switch (control->type) {

	case WM8994:

	case WM8958:

		mask |= WM8994_AIF1DAC2L_ENA | WM8994_AIF1DAC2R_ENA;

		break;

	default:

		break;

	}



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		if (wm8994->aif1clk_enable) {

			snd_soc_update_bits(codec, WM8994_AIF1_CLOCKING_1,

					    WM8994_AIF1CLK_ENA_MASK,

					    WM8994_AIF1CLK_ENA);

			wm8994->aif1clk_enable = 0;

		}

		if (wm8994->aif2clk_enable) {

			snd_soc_update_bits(codec, WM8994_AIF2_CLOCKING_1,

					    WM8994_AIF2CLK_ENA_MASK,

					    WM8994_AIF2CLK_ENA);

			wm8994->aif2clk_enable = 0;

		}

		val = snd_soc_read(codec, WM8994_AIF1_CONTROL_1);

		if ((val & WM8994_AIF1ADCL_SRC) &&

		    (val & WM8994_AIF1ADCR_SRC))

			adc = WM8994_AIF1ADC1R_ENA | WM8994_AIF1ADC2R_ENA;

		else if (!(val & WM8994_AIF1ADCL_SRC) &&

			 !(val & WM8994_AIF1ADCR_SRC))

			adc = WM8994_AIF1ADC1L_ENA | WM8994_AIF1ADC2L_ENA;

		else

			adc = WM8994_AIF1ADC1R_ENA | WM8994_AIF1ADC2R_ENA |

				WM8994_AIF1ADC1L_ENA | WM8994_AIF1ADC2L_ENA;



		val = snd_soc_read(codec, WM8994_AIF1_CONTROL_2);

		if ((val & WM8994_AIF1DACL_SRC) &&

		    (val & WM8994_AIF1DACR_SRC))

			dac = WM8994_AIF1DAC1R_ENA | WM8994_AIF1DAC2R_ENA;

		else if (!(val & WM8994_AIF1DACL_SRC) &&

			 !(val & WM8994_AIF1DACR_SRC))

			dac = WM8994_AIF1DAC1L_ENA | WM8994_AIF1DAC2L_ENA;

		else

			dac = WM8994_AIF1DAC1R_ENA | WM8994_AIF1DAC2R_ENA |

				WM8994_AIF1DAC1L_ENA | WM8994_AIF1DAC2L_ENA;



		snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_4,

				    mask, adc);

		snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_5,

				    mask, dac);

		snd_soc_update_bits(codec, WM8994_CLOCKING_1,

				    WM8994_AIF1DSPCLK_ENA |

				    WM8994_SYSDSPCLK_ENA,

				    WM8994_AIF1DSPCLK_ENA |

				    WM8994_SYSDSPCLK_ENA);

		snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_4, mask,

				    WM8994_AIF1ADC1R_ENA |

				    WM8994_AIF1ADC1L_ENA |

				    WM8994_AIF1ADC2R_ENA |

				    WM8994_AIF1ADC2L_ENA);

		snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_5, mask,

				    WM8994_AIF1DAC1R_ENA |

				    WM8994_AIF1DAC1L_ENA |

				    WM8994_AIF1DAC2R_ENA |

				    WM8994_AIF1DAC2L_ENA);

		break;

	}



	/* We may also have postponed startup of DSP, handle that. */

	wm8958_aif_ev(w, kcontrol, event);

	case SND_SOC_DAPM_PRE_PMD:

	case SND_SOC_DAPM_POST_PMD:

		snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_5,

				    mask, 0);

		snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_4,

				    mask, 0);



		val = snd_soc_read(codec, WM8994_CLOCKING_1);

		if (val & WM8994_AIF2DSPCLK_ENA)

			val = WM8994_SYSDSPCLK_ENA;

		else

			val = 0;

		snd_soc_update_bits(codec, WM8994_CLOCKING_1,

				    WM8994_SYSDSPCLK_ENA |

				    WM8994_AIF1DSPCLK_ENA, val);

		break;

	}



	return 0;

}



static int late_disable_ev(struct snd_soc_dapm_widget *w,

static int aif2clk_ev(struct snd_soc_dapm_widget *w,

		      struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = w->codec;

	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);

	int dac;

	int adc;

	int val;



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		val = snd_soc_read(codec, WM8994_AIF2_CONTROL_1);

		if ((val & WM8994_AIF2ADCL_SRC) &&

		    (val & WM8994_AIF2ADCR_SRC))

			adc = WM8994_AIF2ADCR_ENA;

		else if (!(val & WM8994_AIF2ADCL_SRC) &&

			 !(val & WM8994_AIF2ADCR_SRC))

			adc = WM8994_AIF2ADCL_ENA;

		else

			adc = WM8994_AIF2ADCL_ENA | WM8994_AIF2ADCR_ENA;





		val = snd_soc_read(codec, WM8994_AIF2_CONTROL_2);

		if ((val & WM8994_AIF2DACL_SRC) &&

		    (val & WM8994_AIF2DACR_SRC))

			dac = WM8994_AIF2DACR_ENA;

		else if (!(val & WM8994_AIF2DACL_SRC) &&

			 !(val & WM8994_AIF2DACR_SRC))

			dac = WM8994_AIF2DACL_ENA;

		else

			dac = WM8994_AIF2DACL_ENA | WM8994_AIF2DACR_ENA;



		snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_4,

				    WM8994_AIF2ADCL_ENA |

				    WM8994_AIF2ADCR_ENA, adc);

		snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_5,

				    WM8994_AIF2DACL_ENA |

				    WM8994_AIF2DACR_ENA, dac);

		snd_soc_update_bits(codec, WM8994_CLOCKING_1,

				    WM8994_AIF2DSPCLK_ENA |

				    WM8994_SYSDSPCLK_ENA,

				    WM8994_AIF2DSPCLK_ENA |

				    WM8994_SYSDSPCLK_ENA);

		snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_4,

				    WM8994_AIF2ADCL_ENA |

				    WM8994_AIF2ADCR_ENA,

				    WM8994_AIF2ADCL_ENA |

				    WM8994_AIF2ADCR_ENA);

		snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_5,

				    WM8994_AIF2DACL_ENA |

				    WM8994_AIF2DACR_ENA,

				    WM8994_AIF2DACL_ENA |

				    WM8994_AIF2DACR_ENA);

		break;



	case SND_SOC_DAPM_PRE_PMD:

	case SND_SOC_DAPM_POST_PMD:

		if (wm8994->aif1clk_disable) {

			snd_soc_update_bits(codec, WM8994_AIF1_CLOCKING_1,

					    WM8994_AIF1CLK_ENA_MASK, 0);

			wm8994->aif1clk_disable = 0;

		}

		if (wm8994->aif2clk_disable) {

			snd_soc_update_bits(codec, WM8994_AIF2_CLOCKING_1,

					    WM8994_AIF2CLK_ENA_MASK, 0);

			wm8994->aif2clk_disable = 0;

		}

		snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_5,

				    WM8994_AIF2DACL_ENA |

				    WM8994_AIF2DACR_ENA, 0);

		snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_5,

				    WM8994_AIF2ADCL_ENA |

				    WM8994_AIF2ADCR_ENA, 0);



		val = snd_soc_read(codec, WM8994_CLOCKING_1);

		if (val & WM8994_AIF1DSPCLK_ENA)

			val = WM8994_SYSDSPCLK_ENA;

		else

			val = 0;

		snd_soc_update_bits(codec, WM8994_CLOCKING_1,

				    WM8994_SYSDSPCLK_ENA |

				    WM8994_AIF2DSPCLK_ENA, val);

		break;

	}



	return 0;

}



static int aif1clk_ev(struct snd_soc_dapm_widget *w,

static int aif1clk_late_ev(struct snd_soc_dapm_widget *w,

			   struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = w->codec;
@@ -1071,7 +1180,7 @@ static int aif1clk_ev(struct snd_soc_dapm_widget *w, 
	return 0;

}



static int aif2clk_ev(struct snd_soc_dapm_widget *w,

static int aif2clk_late_ev(struct snd_soc_dapm_widget *w,

			   struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = w->codec;
@@ -1089,6 +1198,63 @@ static int aif2clk_ev(struct snd_soc_dapm_widget *w, 
	return 0;

}



static int late_enable_ev(struct snd_soc_dapm_widget *w,

			  struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = w->codec;

	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		if (wm8994->aif1clk_enable) {

			aif1clk_ev(w, kcontrol, event);

			snd_soc_update_bits(codec, WM8994_AIF1_CLOCKING_1,

					    WM8994_AIF1CLK_ENA_MASK,

					    WM8994_AIF1CLK_ENA);

			wm8994->aif1clk_enable = 0;

		}

		if (wm8994->aif2clk_enable) {

			aif2clk_ev(w, kcontrol, event);

			snd_soc_update_bits(codec, WM8994_AIF2_CLOCKING_1,

					    WM8994_AIF2CLK_ENA_MASK,

					    WM8994_AIF2CLK_ENA);

			wm8994->aif2clk_enable = 0;

		}

		break;

	}



	/* We may also have postponed startup of DSP, handle that. */

	wm8958_aif_ev(w, kcontrol, event);



	return 0;

}



static int late_disable_ev(struct snd_soc_dapm_widget *w,

			   struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = w->codec;

	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);



	switch (event) {

	case SND_SOC_DAPM_POST_PMD:

		if (wm8994->aif1clk_disable) {

			snd_soc_update_bits(codec, WM8994_AIF1_CLOCKING_1,

					    WM8994_AIF1CLK_ENA_MASK, 0);

			aif1clk_ev(w, kcontrol, event);

			wm8994->aif1clk_disable = 0;

		}

		if (wm8994->aif2clk_disable) {

			snd_soc_update_bits(codec, WM8994_AIF2_CLOCKING_1,

					    WM8994_AIF2CLK_ENA_MASK, 0);

			aif2clk_ev(w, kcontrol, event);

			wm8994->aif2clk_disable = 0;

		}

		break;

	}



	return 0;

}



static int adc_mux_ev(struct snd_soc_dapm_widget *w,

		      struct snd_kcontrol *kcontrol, int event)

{
@@ -1385,9 +1551,9 @@ static const struct snd_kcontrol_new aif2dacr_src_mux = 
	SOC_DAPM_ENUM("AIF2DACR Mux", aif2dacr_src_enum);



static const struct snd_soc_dapm_widget wm8994_lateclk_revd_widgets[] = {

SND_SOC_DAPM_SUPPLY("AIF1CLK", SND_SOC_NOPM, 0, 0, aif1clk_ev,

SND_SOC_DAPM_SUPPLY("AIF1CLK", SND_SOC_NOPM, 0, 0, aif1clk_late_ev,

	SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),

SND_SOC_DAPM_SUPPLY("AIF2CLK", SND_SOC_NOPM, 0, 0, aif2clk_ev,

SND_SOC_DAPM_SUPPLY("AIF2CLK", SND_SOC_NOPM, 0, 0, aif2clk_late_ev,

	SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),



SND_SOC_DAPM_PGA_E("Late DAC1L Enable PGA", SND_SOC_NOPM, 0, 0, NULL, 0,
@@ -1416,8 +1582,10 @@ SND_SOC_DAPM_POST("Late Disable PGA", late_disable_ev) 
};



static const struct snd_soc_dapm_widget wm8994_lateclk_widgets[] = {

SND_SOC_DAPM_SUPPLY("AIF1CLK", WM8994_AIF1_CLOCKING_1, 0, 0, NULL, 0),

SND_SOC_DAPM_SUPPLY("AIF2CLK", WM8994_AIF2_CLOCKING_1, 0, 0, NULL, 0),

SND_SOC_DAPM_SUPPLY("AIF1CLK", WM8994_AIF1_CLOCKING_1, 0, 0, aif1clk_ev,

		    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD),

SND_SOC_DAPM_SUPPLY("AIF2CLK", WM8994_AIF2_CLOCKING_1, 0, 0, aif2clk_ev,

		    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD),

SND_SOC_DAPM_PGA("Direct Voice", SND_SOC_NOPM, 0, 0, NULL, 0),

SND_SOC_DAPM_MIXER("SPKL", WM8994_POWER_MANAGEMENT_3, 8, 0,

		   left_speaker_mixer, ARRAY_SIZE(left_speaker_mixer)),
@@ -1470,30 +1638,30 @@ SND_SOC_DAPM_SUPPLY("VMID", SND_SOC_NOPM, 0, 0, vmid_event, 
SND_SOC_DAPM_SUPPLY("CLK_SYS", SND_SOC_NOPM, 0, 0, clk_sys_event,

		    SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),



SND_SOC_DAPM_SUPPLY("DSP1CLK", WM8994_CLOCKING_1, 3, 0, NULL, 0),

SND_SOC_DAPM_SUPPLY("DSP2CLK", WM8994_CLOCKING_1, 2, 0, NULL, 0),

SND_SOC_DAPM_SUPPLY("DSPINTCLK", WM8994_CLOCKING_1, 1, 0, NULL, 0),

SND_SOC_DAPM_SUPPLY("DSP1CLK", SND_SOC_NOPM, 3, 0, NULL, 0),

SND_SOC_DAPM_SUPPLY("DSP2CLK", SND_SOC_NOPM, 2, 0, NULL, 0),

SND_SOC_DAPM_SUPPLY("DSPINTCLK", SND_SOC_NOPM, 1, 0, NULL, 0),



SND_SOC_DAPM_AIF_OUT("AIF1ADC1L", NULL,

		     0, WM8994_POWER_MANAGEMENT_4, 9, 0),

		     0, SND_SOC_NOPM, 9, 0),

SND_SOC_DAPM_AIF_OUT("AIF1ADC1R", NULL,

		     0, WM8994_POWER_MANAGEMENT_4, 8, 0),

		     0, SND_SOC_NOPM, 8, 0),

SND_SOC_DAPM_AIF_IN_E("AIF1DAC1L", NULL, 0,

		      WM8994_POWER_MANAGEMENT_5, 9, 0, wm8958_aif_ev,

		      SND_SOC_NOPM, 9, 0, wm8958_aif_ev,

		      SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),

SND_SOC_DAPM_AIF_IN_E("AIF1DAC1R", NULL, 0,

		      WM8994_POWER_MANAGEMENT_5, 8, 0, wm8958_aif_ev,

		      SND_SOC_NOPM, 8, 0, wm8958_aif_ev,

		      SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),



SND_SOC_DAPM_AIF_OUT("AIF1ADC2L", NULL,

		     0, WM8994_POWER_MANAGEMENT_4, 11, 0),

		     0, SND_SOC_NOPM, 11, 0),

SND_SOC_DAPM_AIF_OUT("AIF1ADC2R", NULL,

		     0, WM8994_POWER_MANAGEMENT_4, 10, 0),

		     0, SND_SOC_NOPM, 10, 0),

SND_SOC_DAPM_AIF_IN_E("AIF1DAC2L", NULL, 0,

		      WM8994_POWER_MANAGEMENT_5, 11, 0, wm8958_aif_ev,

		      SND_SOC_NOPM, 11, 0, wm8958_aif_ev,

		      SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),

SND_SOC_DAPM_AIF_IN_E("AIF1DAC2R", NULL, 0,

		      WM8994_POWER_MANAGEMENT_5, 10, 0, wm8958_aif_ev,

		      SND_SOC_NOPM, 10, 0, wm8958_aif_ev,

		      SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),



SND_SOC_DAPM_MIXER("AIF1ADC1L Mixer", SND_SOC_NOPM, 0, 0,
@@ -1520,14 +1688,14 @@ SND_SOC_DAPM_MIXER("DAC1R Mixer", SND_SOC_NOPM, 0, 0, 
		   dac1r_mix, ARRAY_SIZE(dac1r_mix)),



SND_SOC_DAPM_AIF_OUT("AIF2ADCL", NULL, 0,

		     WM8994_POWER_MANAGEMENT_4, 13, 0),

		     SND_SOC_NOPM, 13, 0),

SND_SOC_DAPM_AIF_OUT("AIF2ADCR", NULL, 0,

		     WM8994_POWER_MANAGEMENT_4, 12, 0),

		     SND_SOC_NOPM, 12, 0),

SND_SOC_DAPM_AIF_IN_E("AIF2DACL", NULL, 0,

		      WM8994_POWER_MANAGEMENT_5, 13, 0, wm8958_aif_ev,

		      SND_SOC_NOPM, 13, 0, wm8958_aif_ev,

		      SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),

SND_SOC_DAPM_AIF_IN_E("AIF2DACR", NULL, 0,

		      WM8994_POWER_MANAGEMENT_5, 12, 0, wm8958_aif_ev,

		      SND_SOC_NOPM, 12, 0, wm8958_aif_ev,

		      SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),



SND_SOC_DAPM_AIF_IN("AIF1DACDAT", NULL, 0, SND_SOC_NOPM, 0, 0),

sound/soc/sh/fsi.c

+3 −4
Original line number Diff line number Diff line
@@ -1001,11 +1001,10 @@ static void fsi_dma_do_tasklet(unsigned long data) 
	sg_dma_address(&sg) = buf;

	sg_dma_len(&sg) = len;



	desc = chan->device->device_prep_slave_sg(chan, &sg, 1, dir,

						  DMA_PREP_INTERRUPT |

						  DMA_CTRL_ACK);

	desc = dmaengine_prep_slave_sg(chan, &sg, 1, dir,

				       DMA_PREP_INTERRUPT | DMA_CTRL_ACK);

	if (!desc) {

		dev_err(dai->dev, "device_prep_slave_sg() fail\n");

		dev_err(dai->dev, "dmaengine_prep_slave_sg() fail\n");

		return;

	}

sound/soc/soc-core.c

+1 −0
Original line number Diff line number Diff line
@@ -3119,6 +3119,7 @@ int snd_soc_register_card(struct snd_soc_card *card) 
				 GFP_KERNEL);

	if (card->rtd == NULL)

		return -ENOMEM;

	card->num_rtd = 0;

	card->rtd_aux = &card->rtd[card->num_links];



	for (i = 0; i < card->num_links; i++)

sound/soc/soc-dapm.c

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ static int dapm_up_seq[] = { 
	[snd_soc_dapm_out_drv] = 10,

	[snd_soc_dapm_hp] = 10,

	[snd_soc_dapm_spk] = 10,

	[snd_soc_dapm_line] = 10,

	[snd_soc_dapm_post] = 11,

};
@@ -75,6 +76,7 @@ static int dapm_down_seq[] = { 
	[snd_soc_dapm_adc] = 1,

	[snd_soc_dapm_hp] = 2,

	[snd_soc_dapm_spk] = 2,

	[snd_soc_dapm_line] = 2,

	[snd_soc_dapm_out_drv] = 2,

	[snd_soc_dapm_pga] = 4,

	[snd_soc_dapm_mixer_named_ctl] = 5,

CRA Git | Maintained and supported by SUSTech CRA and CCSE