Commit 6277d53a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Don't set to D3 in Cirrus errata init verbs
  ALSA: hda - add new Fermi 5xx codec IDs to snd-hda
  ASoC: WM8994: Ensure late enable events are processed for the ADCs
  ASoC: WM8994: Don't disable the AIF[1|2]CLK_ENA unconditionaly
  ASoC: Fix WM9081 platform data initialisation
  ALSA: hda - Fix unable to record issue on ASUS N82JV
  ALSA: HDA: Realtek: Fixup jack detection to input subsystem
parents d7a62cd0 2133991d

sound/pci/hda/patch_cirrus.c

+2 −0
Original line number Diff line number Diff line
@@ -1039,9 +1039,11 @@ static struct hda_verb cs_errata_init_verbs[] = { 
	{0x11, AC_VERB_SET_PROC_COEF, 0x0008},

	{0x11, AC_VERB_SET_PROC_STATE, 0x00},



#if 0 /* Don't to set to D3 as we are in power-up sequence */

	{0x07, AC_VERB_SET_POWER_STATE, 0x03}, /* S/PDIF Rx: D3 */

	{0x08, AC_VERB_SET_POWER_STATE, 0x03}, /* S/PDIF Tx: D3 */

	/*{0x01, AC_VERB_SET_POWER_STATE, 0x03},*/ /* AFG: D3 This is already handled */

#endif



	{} /* terminator */

};

sound/pci/hda/patch_hdmi.c

+5 −0
Original line number Diff line number Diff line
@@ -1634,6 +1634,9 @@ static struct hda_codec_preset snd_hda_preset_hdmi[] = { 
{ .id = 0x10de0012, .name = "GPU 12 HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },

{ .id = 0x10de0013, .name = "GPU 13 HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },

{ .id = 0x10de0014, .name = "GPU 14 HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },

{ .id = 0x10de0015, .name = "GPU 15 HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },

{ .id = 0x10de0016, .name = "GPU 16 HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },

/* 17 is known to be absent */

{ .id = 0x10de0018, .name = "GPU 18 HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },

{ .id = 0x10de0019, .name = "GPU 19 HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },

{ .id = 0x10de001a, .name = "GPU 1a HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },
@@ -1676,6 +1679,8 @@ MODULE_ALIAS("snd-hda-codec-id:10de0011"); 
MODULE_ALIAS("snd-hda-codec-id:10de0012");

MODULE_ALIAS("snd-hda-codec-id:10de0013");

MODULE_ALIAS("snd-hda-codec-id:10de0014");

MODULE_ALIAS("snd-hda-codec-id:10de0015");

MODULE_ALIAS("snd-hda-codec-id:10de0016");

MODULE_ALIAS("snd-hda-codec-id:10de0018");

MODULE_ALIAS("snd-hda-codec-id:10de0019");

MODULE_ALIAS("snd-hda-codec-id:10de001a");

sound/pci/hda/patch_realtek.c

+3 −6
Original line number Diff line number Diff line
@@ -1133,11 +1133,8 @@ static void alc_automute_speaker(struct hda_codec *codec, int pinctl) 
		nid = spec->autocfg.hp_pins[i];

		if (!nid)

			break;

		if (snd_hda_jack_detect(codec, nid)) {

			spec->jack_present = 1;

			break;

		}

		alc_report_jack(codec, spec->autocfg.hp_pins[i]);

		alc_report_jack(codec, nid);

		spec->jack_present |= snd_hda_jack_detect(codec, nid);

	}















	mute = spec->jack_present ? HDA_AMP_MUTE : 0;










@@ -15015,7 +15012,7 @@ static struct snd_pci_quirk alc269_cfg_tbl[] = {













	SND_PCI_QUIRK(0x1043, 0x11e3, "ASUS U33Jc", ALC269VB_AMIC),















	SND_PCI_QUIRK(0x1043, 0x1273, "ASUS UL80Jt", ALC269VB_AMIC),















	SND_PCI_QUIRK(0x1043, 0x1283, "ASUS U53Jc", ALC269_AMIC),













	SND_PCI_QUIRK(0x1043, 0x12b3, "ASUS N82Jv", ALC269_AMIC),













	SND_PCI_QUIRK(0x1043, 0x12b3, "ASUS N82JV", ALC269VB_AMIC),















	SND_PCI_QUIRK(0x1043, 0x12d3, "ASUS N61Jv", ALC269_AMIC),















	SND_PCI_QUIRK(0x1043, 0x13a3, "ASUS UL30Vt", ALC269_AMIC),















	SND_PCI_QUIRK(0x1043, 0x1373, "ASUS G73JX", ALC269_AMIC),

































sound/soc/codecs/wm8994.c



+42
−9






























Original line number
Diff line number
Diff line








@@ -110,6 +110,9 @@ struct wm8994_priv {





























	unsigned int aif1clk_enable:1;















	unsigned int aif2clk_enable:1;



























	unsigned int aif1clk_disable:1;













	unsigned int aif2clk_disable:1;















};































static int wm8994_readable(unsigned int reg)










@@ -1015,14 +1018,18 @@ static int late_enable_ev(struct snd_soc_dapm_widget *w,





























	switch (event) {















	case SND_SOC_DAPM_PRE_PMU:













		if (wm8994->aif1clk_enable)













		if (wm8994->aif1clk_enable) {















			snd_soc_update_bits(codec, WM8994_AIF1_CLOCKING_1,















					    WM8994_AIF1CLK_ENA_MASK,















					    WM8994_AIF1CLK_ENA);













		if (wm8994->aif2clk_enable)













			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;













		}















		break;















	}

























@@ -1037,15 +1044,15 @@ static int late_disable_ev(struct snd_soc_dapm_widget *w,





























	switch (event) {















	case SND_SOC_DAPM_POST_PMD:













		if (wm8994->aif1clk_enable) {













		if (wm8994->aif1clk_disable) {















			snd_soc_update_bits(codec, WM8994_AIF1_CLOCKING_1,















					    WM8994_AIF1CLK_ENA_MASK, 0);













			wm8994->aif1clk_enable = 0;













			wm8994->aif1clk_disable = 0;















		}













		if (wm8994->aif2clk_enable) {













		if (wm8994->aif2clk_disable) {















			snd_soc_update_bits(codec, WM8994_AIF2_CLOCKING_1,















					    WM8994_AIF2CLK_ENA_MASK, 0);













			wm8994->aif2clk_enable = 0;













			wm8994->aif2clk_disable = 0;















		}















		break;















	}









@@ -1063,6 +1070,9 @@ static int aif1clk_ev(struct snd_soc_dapm_widget *w,













	case SND_SOC_DAPM_PRE_PMU:















		wm8994->aif1clk_enable = 1;















		break;













	case SND_SOC_DAPM_POST_PMD:













		wm8994->aif1clk_disable = 1;













		break;















	}































	return 0;









@@ -1078,11 +1088,21 @@ static int aif2clk_ev(struct snd_soc_dapm_widget *w,













	case SND_SOC_DAPM_PRE_PMU:















		wm8994->aif2clk_enable = 1;















		break;













	case SND_SOC_DAPM_POST_PMD:













		wm8994->aif2clk_disable = 1;













		break;















	}































	return 0;















}





























static int adc_mux_ev(struct snd_soc_dapm_widget *w,













		      struct snd_kcontrol *kcontrol, int event)













{













	late_enable_ev(w, kcontrol, event);













	return 0;













}





























static int dac_ev(struct snd_soc_dapm_widget *w,















		  struct snd_kcontrol *kcontrol, int event)















{










@@ -1403,6 +1423,18 @@ SND_SOC_DAPM_DAC("DAC1L", NULL, WM8994_POWER_MANAGEMENT_5, 1, 0),













SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 0, 0),















};





























static const struct snd_soc_dapm_widget wm8994_adc_revd_widgets[] = {













SND_SOC_DAPM_MUX_E("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux,













		   adc_mux_ev, SND_SOC_DAPM_PRE_PMU),













SND_SOC_DAPM_MUX_E("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux,













		   adc_mux_ev, SND_SOC_DAPM_PRE_PMU),













};



























static const struct snd_soc_dapm_widget wm8994_adc_widgets[] = {













SND_SOC_DAPM_MUX("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux),













SND_SOC_DAPM_MUX("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux),













};





























static const struct snd_soc_dapm_widget wm8994_dapm_widgets[] = {















SND_SOC_DAPM_INPUT("DMIC1DAT"),















SND_SOC_DAPM_INPUT("DMIC2DAT"),










@@ -1497,9 +1529,6 @@ SND_SOC_DAPM_ADC("DMIC1R", NULL, WM8994_POWER_MANAGEMENT_4, 2, 0),













SND_SOC_DAPM_ADC("ADCL", NULL, SND_SOC_NOPM, 1, 0),















SND_SOC_DAPM_ADC("ADCR", NULL, SND_SOC_NOPM, 0, 0),





























SND_SOC_DAPM_MUX("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux),













SND_SOC_DAPM_MUX("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux),





























SND_SOC_DAPM_MUX("Left Headphone Mux", SND_SOC_NOPM, 0, 0, &hpl_mux),















SND_SOC_DAPM_MUX("Right Headphone Mux", SND_SOC_NOPM, 0, 0, &hpr_mux),


























@@ -3280,11 +3309,15 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)













		if (wm8994->revision < 4) {















			snd_soc_dapm_new_controls(dapm, wm8994_lateclk_revd_widgets,















						  ARRAY_SIZE(wm8994_lateclk_revd_widgets));













			snd_soc_dapm_new_controls(dapm, wm8994_adc_revd_widgets,













						  ARRAY_SIZE(wm8994_adc_revd_widgets));















			snd_soc_dapm_new_controls(dapm, wm8994_dac_revd_widgets,















						  ARRAY_SIZE(wm8994_dac_revd_widgets));















		} else {















			snd_soc_dapm_new_controls(dapm, wm8994_lateclk_widgets,















						  ARRAY_SIZE(wm8994_lateclk_widgets));













			snd_soc_dapm_new_controls(dapm, wm8994_adc_widgets,













						  ARRAY_SIZE(wm8994_adc_widgets));















			snd_soc_dapm_new_controls(dapm, wm8994_dac_widgets,















						  ARRAY_SIZE(wm8994_dac_widgets));















		}

































sound/soc/codecs/wm9081.c



+5
−0






























Original line number
Diff line number
Diff line








@@ -15,6 +15,7 @@













#include <linux/moduleparam.h>















#include <linux/init.h>















#include <linux/delay.h>













#include <linux/device.h>















#include <linux/pm.h>















#include <linux/i2c.h>















#include <linux/platform_device.h>










@@ -1341,6 +1342,10 @@ static __devinit int wm9081_i2c_probe(struct i2c_client *i2c,













	wm9081->control_type = SND_SOC_I2C;















	wm9081->control_data = i2c;





























	if (dev_get_platdata(&i2c->dev))













		memcpy(&wm9081->retune, dev_get_platdata(&i2c->dev),













		       sizeof(wm9081->retune));





























	ret = snd_soc_register_codec(&i2c->dev,















			&soc_codec_dev_wm9081, &wm9081_dai, 1);















	if (ret < 0)



































































CRA Git | Maintained and supported by SUSTech CRA and CCSE