Commit 76d9b0dd authored by Harald Welte's avatar Harald Welte Committed by Jaroslav Kysela
Browse files

ALSA: HDA patch_via.c: HP and CD pin connect config 



Signed-off-by: default avatarHarald Welte <HaraldWelte@viatech.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent eb14a46c

sound/pci/hda/patch_via.c

+30 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * HD audio interface patch for VIA VT1708 codec

 *

 * Copyright (c) 2006 Lydia Wang <lydiawang@viatech.com>

 * Copyright (c) 2006-2008 Lydia Wang <lydiawang@viatech.com>

 *			   Takashi Iwai <tiwai@suse.de>

 *

 *  This driver is free software; you can redistribute it and/or modify
@@ -29,6 +29,7 @@ 
/* 2006-09-08  Lydia Wang  Fix internal loopback recording source select bug */

/* 2007-09-12  Lydia Wang  Add EAPD enable during driver initialization      */

/* 2007-09-17  Lydia Wang  Add VT1708B codec support                        */

/* 2007-11-14  Lydia Wang  Add VT1708A codec HP and CD pin connect config    */

/*                                                                           */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -53,6 +54,8 @@ 
#define VT1708_DIGOUT_NID	0x14

#define VT1708_DIGIN_NID	0x16

#define VT1708_DIGIN_PIN	0x26

#define VT1708_HP_PIN_NID      0x20

#define VT1708_CD_PIN_NID      0x24



#define VT1709_HP_DAC_NID	0x28

#define VT1709_DIGOUT_NID	0x13
@@ -840,11 +843,36 @@ static struct hda_amp_list vt1708_loopbacks[] = { 
};

#endif



static void vt1708_set_pinconfig_connect(struct hda_codec *codec, hda_nid_t nid)

{

	unsigned int def_conf;

	unsigned char seqassoc;



	def_conf = snd_hda_codec_read(codec, nid, 0,

				      AC_VERB_GET_CONFIG_DEFAULT, 0);

	seqassoc = (unsigned char) get_defcfg_association(def_conf);

	seqassoc = (seqassoc << 4) | get_defcfg_sequence(def_conf);

	if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE) {

		if (seqassoc == 0xff) {

			def_conf = def_conf & (~(AC_JACK_PORT_BOTH << 30));

			snd_hda_codec_write(codec, nid, 0,

					    AC_VERB_SET_CONFIG_DEFAULT_BYTES_3,

					    def_conf >> 24);

		}

	}



	return;

}



static int vt1708_parse_auto_config(struct hda_codec *codec)

{

	struct via_spec *spec = codec->spec;

	int err;



	/* Add HP and CD pin config connect bit re-config action */

	vt1708_set_pinconfig_connect(codec, VT1708_HP_PIN_NID);

	vt1708_set_pinconfig_connect(codec, VT1708_CD_PIN_NID);



	err = snd_hda_parse_pin_def_config(codec, &spec->autocfg, NULL);

	if (err < 0)

		return err;