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

ALSA: hda - Add support for Toshiba Satellite M300 



Added the support for Toshiba Satellite M300 with Conexant 5051 codec.
Since the laptop has no port C connection and the pin reports always
the jack sense true, we need to ignore port-C unsol event.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 4e4ac600

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ Conexant 5051 
  hp-dv6736	HP dv6736

  hp-f700	HP Compaq Presario F700

  lenovo-x200	Lenovo X200 laptop

  toshiba	Toshiba Satellite M300



Conexant 5066

=============

sound/pci/hda/patch_conexant.c

+33 −5
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ 
#define CXT5051_PORTB_EVENT	0x38

#define CXT5051_PORTC_EVENT	0x39



#define AUTO_MIC_PORTB		(1 << 1)

#define AUTO_MIC_PORTC		(1 << 2)



struct conexant_jack {
@@ -74,7 +76,7 @@ struct conexant_spec { 
					 */

	unsigned int cur_eapd;

	unsigned int hp_present;

	unsigned int no_auto_mic;

	unsigned int auto_mic;

	unsigned int need_dac_fix;



	/* capture */
@@ -1626,7 +1628,7 @@ static void cxt5051_portb_automic(struct hda_codec *codec) 
	struct conexant_spec *spec = codec->spec;

	unsigned int present;



	if (spec->no_auto_mic)

	if (!(spec->auto_mic & AUTO_MIC_PORTB))

		return;

	present = snd_hda_jack_detect(codec, 0x17);

	snd_hda_codec_write(codec, 0x14, 0,
@@ -1641,7 +1643,7 @@ static void cxt5051_portc_automic(struct hda_codec *codec) 
	unsigned int present;

	hda_nid_t new_adc;



	if (spec->no_auto_mic)

	if (!(spec->auto_mic & AUTO_MIC_PORTC))

		return;

	present = snd_hda_jack_detect(codec, 0x18);

	if (present)
@@ -1757,6 +1759,24 @@ static struct snd_kcontrol_new cxt5051_f700_mixers[] = { 
	{}

};



static struct snd_kcontrol_new cxt5051_toshiba_mixers[] = {

	HDA_CODEC_VOLUME("Internal Mic Volume", 0x14, 0x00, HDA_INPUT),

	HDA_CODEC_MUTE("Internal Mic Switch", 0x14, 0x00, HDA_INPUT),

	HDA_CODEC_VOLUME("External Mic Volume", 0x14, 0x01, HDA_INPUT),

	HDA_CODEC_MUTE("External Mic Switch", 0x14, 0x01, HDA_INPUT),

	HDA_CODEC_VOLUME("Master Playback Volume", 0x10, 0x00, HDA_OUTPUT),

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = "Master Playback Switch",

		.info = cxt_eapd_info,

		.get = cxt_eapd_get,

		.put = cxt5051_hp_master_sw_put,

		.private_value = 0x1a,

	},



	{}

};



static struct hda_verb cxt5051_init_verbs[] = {

	/* Line in, Mic */

	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},
@@ -1893,6 +1913,7 @@ enum { 
	CXT5051_HP_DV6736,	/* HP without mic switch */

	CXT5051_LENOVO_X200,	/* Lenovo X200 laptop */

	CXT5051_F700,       /* HP Compaq Presario F700 */

	CXT5051_TOSHIBA,	/* Toshiba M300 & co */

	CXT5051_MODELS

};
@@ -1902,12 +1923,14 @@ static const char *cxt5051_models[CXT5051_MODELS] = { 
	[CXT5051_HP_DV6736]	= "hp-dv6736",

	[CXT5051_LENOVO_X200]	= "lenovo-x200",

	[CXT5051_F700]          = "hp-700",

	[CXT5051_TOSHIBA]	= "toshiba",

};



static struct snd_pci_quirk cxt5051_cfg_tbl[] = {

	SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV6736", CXT5051_HP_DV6736),

	SND_PCI_QUIRK(0x103c, 0x360b, "Compaq Presario CQ60", CXT5051_HP),

	SND_PCI_QUIRK(0x103c, 0x30ea, "Compaq Presario F700", CXT5051_F700),

	SND_PCI_QUIRK(0x1179, 0xff50, "Toshiba M30x", CXT5051_TOSHIBA),

	SND_PCI_QUIRK(0x14f1, 0x0101, "Conexant Reference board",

		      CXT5051_LAPTOP),

	SND_PCI_QUIRK(0x14f1, 0x5051, "HP Spartan 1.1", CXT5051_HP),
@@ -1950,6 +1973,7 @@ static int patch_cxt5051(struct hda_codec *codec) 
	board_config = snd_hda_check_board_config(codec, CXT5051_MODELS,

						  cxt5051_models,

						  cxt5051_cfg_tbl);

	spec->auto_mic = AUTO_MIC_PORTB | AUTO_MIC_PORTC;

	switch (board_config) {

	case CXT5051_HP:

		spec->mixers[0] = cxt5051_hp_mixers;
@@ -1957,7 +1981,7 @@ static int patch_cxt5051(struct hda_codec *codec) 
	case CXT5051_HP_DV6736:

		spec->init_verbs[0] = cxt5051_hp_dv6736_init_verbs;

		spec->mixers[0] = cxt5051_hp_dv6736_mixers;

		spec->no_auto_mic = 1;

		spec->auto_mic = 0;

		break;

	case CXT5051_LENOVO_X200:

		spec->init_verbs[0] = cxt5051_lenovo_x200_init_verbs;
@@ -1965,7 +1989,11 @@ static int patch_cxt5051(struct hda_codec *codec) 
	case CXT5051_F700:

		spec->init_verbs[0] = cxt5051_f700_init_verbs;

		spec->mixers[0] = cxt5051_f700_mixers;

		spec->no_auto_mic = 1;

		spec->auto_mic = 0;

		break;

	case CXT5051_TOSHIBA:

		spec->mixers[0] = cxt5051_toshiba_mixers;

		spec->auto_mic = AUTO_MIC_PORTB;

		break;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE