All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] hda: stac92hd8xxx amp mixers
@ 2009-01-13 18:30 Matthew Ranostay
  2009-01-14  7:02 ` Takashi Iwai
  0 siblings, 1 reply; 3+ messages in thread
From: Matthew Ranostay @ 2009-01-13 18:30 UTC (permalink / raw)
  To: alsa-devel; +Cc: Takashi Iwai

Added amp nid for stac92hd8xxx families of codecs so the input amp
mixer is created.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
---

diff --git a/pci/hda/patch_sigmatel.c b/pci/hda/patch_sigmatel.c
index 35b83dc..dedf8b2 100644
--- a/pci/hda/patch_sigmatel.c
+++ b/pci/hda/patch_sigmatel.c
@@ -331,6 +331,10 @@ static unsigned int stac92hd83xxx_pwr_mapping[4] = {
 	0x03, 0x0c, 0x10, 0x40,
 };
 
+static unsigned int stac92hd83xxx_amp_nids[1] = {
+	0xc,
+};
+
 static hda_nid_t stac92hd71bxx_pwr_nids[3] = {
 	0x0a, 0x0d, 0x0f
 };
@@ -4672,6 +4676,7 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
 	spec->dmux_nids = stac92hd83xxx_dmux_nids;
 	spec->adc_nids = stac92hd83xxx_adc_nids;
 	spec->pwr_nids = stac92hd83xxx_pwr_nids;
+	spec->amp_nids = stac92hd83xxx_amp_nids;
 	spec->pwr_mapping = stac92hd83xxx_pwr_mapping;
 	spec->num_pwrs = ARRAY_SIZE(stac92hd83xxx_pwr_nids);
 	spec->multiout.dac_nids = spec->dac_nids;
@@ -4689,6 +4694,7 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
 	spec->num_pins = ARRAY_SIZE(stac92hd83xxx_pin_nids);
 	spec->num_dmuxes = ARRAY_SIZE(stac92hd83xxx_dmux_nids);
 	spec->num_adcs = ARRAY_SIZE(stac92hd83xxx_adc_nids);
+	spec->num_amps = ARRAY_SIZE(stac92hd83xxx_amp_nids);
 	spec->num_dmics = STAC92HD83XXX_NUM_DMICS;
 	spec->dinput_mux = &stac92hd83xxx_dmux;
 	spec->pin_nids = stac92hd83xxx_pin_nids;

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] hda: stac92hd8xxx amp mixers
  2009-01-13 18:30 [PATCH] hda: stac92hd8xxx amp mixers Matthew Ranostay
@ 2009-01-14  7:02 ` Takashi Iwai
  2009-01-14  8:45   ` Takashi Iwai
  0 siblings, 1 reply; 3+ messages in thread
From: Takashi Iwai @ 2009-01-14  7:02 UTC (permalink / raw)
  To: Matthew Ranostay; +Cc: alsa-devel

At Tue, 13 Jan 2009 13:30:07 -0500,
Matthew Ranostay wrote:
> 
> Added amp nid for stac92hd8xxx families of codecs so the input amp
> mixer is created.
> 
> Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>

Applied.  Thanks.


Takashi

> ---
> 
> diff --git a/pci/hda/patch_sigmatel.c b/pci/hda/patch_sigmatel.c
> index 35b83dc..dedf8b2 100644
> --- a/pci/hda/patch_sigmatel.c
> +++ b/pci/hda/patch_sigmatel.c
> @@ -331,6 +331,10 @@ static unsigned int stac92hd83xxx_pwr_mapping[4] = {
>  	0x03, 0x0c, 0x10, 0x40,
>  };
>  
> +static unsigned int stac92hd83xxx_amp_nids[1] = {
> +	0xc,
> +};
> +
>  static hda_nid_t stac92hd71bxx_pwr_nids[3] = {
>  	0x0a, 0x0d, 0x0f
>  };
> @@ -4672,6 +4676,7 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
>  	spec->dmux_nids = stac92hd83xxx_dmux_nids;
>  	spec->adc_nids = stac92hd83xxx_adc_nids;
>  	spec->pwr_nids = stac92hd83xxx_pwr_nids;
> +	spec->amp_nids = stac92hd83xxx_amp_nids;
>  	spec->pwr_mapping = stac92hd83xxx_pwr_mapping;
>  	spec->num_pwrs = ARRAY_SIZE(stac92hd83xxx_pwr_nids);
>  	spec->multiout.dac_nids = spec->dac_nids;
> @@ -4689,6 +4694,7 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
>  	spec->num_pins = ARRAY_SIZE(stac92hd83xxx_pin_nids);
>  	spec->num_dmuxes = ARRAY_SIZE(stac92hd83xxx_dmux_nids);
>  	spec->num_adcs = ARRAY_SIZE(stac92hd83xxx_adc_nids);
> +	spec->num_amps = ARRAY_SIZE(stac92hd83xxx_amp_nids);
>  	spec->num_dmics = STAC92HD83XXX_NUM_DMICS;
>  	spec->dinput_mux = &stac92hd83xxx_dmux;
>  	spec->pin_nids = stac92hd83xxx_pin_nids;
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] hda: stac92hd8xxx amp mixers
  2009-01-14  7:02 ` Takashi Iwai
@ 2009-01-14  8:45   ` Takashi Iwai
  0 siblings, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2009-01-14  8:45 UTC (permalink / raw)
  To: Matthew Ranostay; +Cc: alsa-devel

At Wed, 14 Jan 2009 08:02:00 +0100,
I wrote:
> 
> At Tue, 13 Jan 2009 13:30:07 -0500,
> Matthew Ranostay wrote:
> > 
> > Added amp nid for stac92hd8xxx families of codecs so the input amp
> > mixer is created.
> > 
> > Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
> 
> Applied.  Thanks.

Oops, I found a bug in this simple patch...
The NID should be in the type hda_nid_t.  Now fixed.

Please do more compile-test before submission at the next time...
(same applies to me :)


thanks,

Takashi

> 
> 
> Takashi
> 
> > ---
> > 
> > diff --git a/pci/hda/patch_sigmatel.c b/pci/hda/patch_sigmatel.c
> > index 35b83dc..dedf8b2 100644
> > --- a/pci/hda/patch_sigmatel.c
> > +++ b/pci/hda/patch_sigmatel.c
> > @@ -331,6 +331,10 @@ static unsigned int stac92hd83xxx_pwr_mapping[4] = {
> >  	0x03, 0x0c, 0x10, 0x40,
> >  };
> >  
> > +static unsigned int stac92hd83xxx_amp_nids[1] = {
> > +	0xc,
> > +};
> > +
> >  static hda_nid_t stac92hd71bxx_pwr_nids[3] = {
> >  	0x0a, 0x0d, 0x0f
> >  };
> > @@ -4672,6 +4676,7 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
> >  	spec->dmux_nids = stac92hd83xxx_dmux_nids;
> >  	spec->adc_nids = stac92hd83xxx_adc_nids;
> >  	spec->pwr_nids = stac92hd83xxx_pwr_nids;
> > +	spec->amp_nids = stac92hd83xxx_amp_nids;
> >  	spec->pwr_mapping = stac92hd83xxx_pwr_mapping;
> >  	spec->num_pwrs = ARRAY_SIZE(stac92hd83xxx_pwr_nids);
> >  	spec->multiout.dac_nids = spec->dac_nids;
> > @@ -4689,6 +4694,7 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
> >  	spec->num_pins = ARRAY_SIZE(stac92hd83xxx_pin_nids);
> >  	spec->num_dmuxes = ARRAY_SIZE(stac92hd83xxx_dmux_nids);
> >  	spec->num_adcs = ARRAY_SIZE(stac92hd83xxx_adc_nids);
> > +	spec->num_amps = ARRAY_SIZE(stac92hd83xxx_amp_nids);
> >  	spec->num_dmics = STAC92HD83XXX_NUM_DMICS;
> >  	spec->dinput_mux = &stac92hd83xxx_dmux;
> >  	spec->pin_nids = stac92hd83xxx_pin_nids;
> > 

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2009-01-14  8:45 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-13 18:30 [PATCH] hda: stac92hd8xxx amp mixers Matthew Ranostay
2009-01-14  7:02 ` Takashi Iwai
2009-01-14  8:45   ` Takashi Iwai

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.