[alsa-devel] [PATCH1/1] hda: digital slave support for IDT codecs

Takashi Iwai tiwai at suse.de
Mon Sep 8 16:37:28 CEST 2008


At Mon, 08 Sep 2008 10:28:53 -0400,
Matthew Ranostay wrote:
> 
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Takashi Iwai wrote:
> > At Sun, 07 Sep 2008 14:36:53 -0400,
> > Matthew Ranostay wrote:
> >> Added slave_dig_outs entries for several IDT codecs that have multiple
> >> SPDIF outs, and enabled these SPDIF outs in several pin configs.
> >>
> Have you pushed your changes lately? I don't see any update since last Wednesday
> in the git log.

Take sound-2.6.git tree from the below:
    git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
Gitweb is
    http://git.kernel.org/?p=linux/kernel/git/tiwai/sound-2.6.git;a=summary

thanks,

Takashi

> >> ---
> >> Signed-off-by: Matthew Ranostay <mranostay at embeddedalley.com>
> > 
> > This patch seems not applicable.
> > Could you rebuild from my latest git tree?
> > Note that the core changes for slave SPDIF was already added.
> > 
> > thanks,
> > 
> > Takashi
> > 
> >> diff --git a/pci/hda/patch_sigmatel.c b/pci/hda/patch_sigmatel.c
> >> index 9968ee4..52b3579 100644
> >> --- a/pci/hda/patch_sigmatel.c
> >> +++ b/pci/hda/patch_sigmatel.c
> >> @@ -229,6 +229,10 @@ static hda_nid_t stac92hd73xx_pwr_nids[8] = {
> >>  	0x0f, 0x10, 0x11
> >>  };
> >>
> >> +static hda_nid_t stac92hd73xx_slave_dig_outs[2] = {
> >> +	0x26, 0,
> >> +};
> >> +
> >>  static hda_nid_t stac92hd73xx_adc_nids[2] = {
> >>  	0x1a, 0x1b
> >>  };
> >> @@ -274,6 +278,10 @@ static hda_nid_t stac92hd83xxx_pwr_nids[4] = {
> >>  	0xa, 0xb, 0xd, 0xe,
> >>  };
> >>
> >> +static hda_nid_t stac92hd83xxx_slave_dig_outs[2] = {
> >> +	0x1e, 0,
> >> +};
> >> +
> >>  static unsigned int stac92hd83xxx_pwr_mapping[4] = {
> >>  	0x03, 0x0c, 0x10, 0x40,
> >>  };
> >> @@ -303,6 +311,10 @@ static hda_nid_t stac92hd71bxx_dmic_nids[STAC92HD71BXX_NUM_DMICS + 1] = {
> >>  	0x18, 0x19, 0
> >>  };
> >>
> >> +static hda_nid_t stac92hd71bxx_slave_dig_outs[2] = {
> >> +	0x22, 0
> >> +};
> >> +
> >>  static hda_nid_t stac925x_adc_nids[1] = {
> >>          0x03,
> >>  };
> >> @@ -396,9 +408,10 @@ static hda_nid_t stac92hd83xxx_pin_nids[14] = {
> >>  	0x0f, 0x10, 0x11, 0x12, 0x13,
> >>  	0x1d, 0x1e, 0x1f, 0x20
> >>  };
> >> -static hda_nid_t stac92hd71bxx_pin_nids[10] = {
> >> +static hda_nid_t stac92hd71bxx_pin_nids[11] = {
> >>  	0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
> >>  	0x0f, 0x14, 0x18, 0x19, 0x1e,
> >> +	0x1f,
> >>  };
> >>
> >>  static hda_nid_t stac927x_pin_nids[14] = {
> >> @@ -1424,22 +1437,22 @@ static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
> >>  		      "DFI LanParty", STAC_92HD71BXX_REF),
> >>  };
> >>
> >> -static unsigned int ref92hd71bxx_pin_configs[10] = {
> >> +static unsigned int ref92hd71bxx_pin_configs[11] = {
> >>  	0x02214030, 0x02a19040, 0x01a19020, 0x01014010,
> >>  	0x0181302e, 0x01114010, 0x01019020, 0x90a000f0,
> >> -	0x90a000f0, 0x01452050,
> >> +	0x90a000f0, 0x01452050, 0x01452050,
> >>  };
> >>
> >> -static unsigned int dell_m4_1_pin_configs[10] = {
> >> +static unsigned int dell_m4_1_pin_configs[11] = {
> >>  	0x0421101f, 0x04a11221, 0x40f000f0, 0x90170110,
> >>  	0x23a1902e, 0x23014250, 0x40f000f0, 0x90a000f0,
> >> -	0x40f000f0, 0x4f0000f0,
> >> +	0x40f000f0, 0x4f0000f0, 0x4f0000f0,
> >>  };
> >>
> >> -static unsigned int dell_m4_2_pin_configs[10] = {
> >> +static unsigned int dell_m4_2_pin_configs[11] = {
> >>  	0x0421101f, 0x04a11221, 0x90a70330, 0x90170110,
> >>  	0x23a1902e, 0x23014250, 0x40f000f0, 0x40f000f0,
> >> -	0x40f000f0, 0x044413b0,
> >> +	0x40f000f0, 0x044413b0, 0x044413b0,
> >>  };
> >>
> >>  static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = {
> >> @@ -3841,8 +3854,9 @@ again:
> >>
> >>  	spec->num_pwrs = ARRAY_SIZE(stac92hd73xx_pwr_nids);
> >>  	spec->pwr_nids = stac92hd73xx_pwr_nids;
> >> +	codec->slave_dig_outs = stac92hd73xx_slave_dig_outs;
> >>
> >> -	err = stac92xx_parse_auto_config(codec, 0x22, 0x24);
> >> +	err = stac92xx_parse_auto_config(codec, 0x22, 0x25);
> >>
> >>  	if (!err) {
> >>  		if (spec->board_config < 0) {
> >> @@ -3883,6 +3897,7 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
> >>  		return -ENOMEM;
> >>
> >>  	codec->spec = spec;
> >> +	codec->slave_dig_outs = stac92hd83xxx_slave_dig_outs;
> >>  	spec->mono_nid = 0x19;
> >>  	spec->digbeep_nid = 0x21;
> >>  	spec->dmic_nids = stac92hd83xxx_dmic_nids;
> >> @@ -4033,6 +4048,7 @@ again:
> >>  	case 0x111d76b5:
> >>  		spec->mixer = stac92hd71bxx_mixer;
> >>  		spec->init = stac92hd71bxx_core_init;
> >> +		codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs;
> >>  		break;
> >>  	case 0x111d7608: /* 5 Port with Analog Mixer */
> >>  		if ((codec->revision_id & 0xf) == 0 ||
> >> @@ -4065,6 +4081,7 @@ again:
> >>  	default:
> >>  		spec->mixer = stac92hd71bxx_analog_mixer;
> >>  		spec->init = stac92hd71bxx_analog_core_init;
> >> +		codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs;
> >>  	}
> >>
> >>  	spec->aloopback_mask = 0x20;
> >>
> > 
> 
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.9 (Darwin)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
> 
> iEUEARECAAYFAkjFNqUACgkQ7s2wy7nhBHWKUgCgjg0/PAGApjKAsGEbDeeg2Qx4
> hTUAl02y0SZSv5HD4O2gTZfzRKP+jgc=
> =uD7P
> -----END PGP SIGNATURE-----
> 


More information about the Alsa-devel mailing list