[alsa-devel] [PATCH - hda-intel conexant benq r55 laptop 1/1] [ALSA] CD-audio sound for hda-intel conexant benq laptop

[Takashi Iwai]

At Tue, 22 Sep 2009 21:42:40 +0200,
nowymarluk at wp.pl wrote:
> 
> From: edoiks <edoiks at edoiks-laptop.(none)>
> 
> After puting a cd-audio inside my laptop there was no sound out here, so I decided to install alsa-driver with debug level and setup a model=test, it didn't help, but then I look at source code and added this few lines, now cd-audio is working both when playback/recording.
> 
> Signed-off-by: Lukasz Marcinowski <nowymarluk at wp.pl>
> Signed-off-by: edoiks <edoiks at edoiks-laptop.(none)>

Judging from your mail address, I stripped this edoiks line.

Also, I fixed some strings for mixer elements and capture source
items to follow the standard rule.  E.g. "CD Audio xxx" is "CD xxx",
and remove trailing spaces from the string.

Now applied to sound git tree, and will be eventually merged to the
upstream, too.


thanks,

Takashi



> diff --git a/pci/hda/patch_conexant.c b/pci/hda/patch_conexant.c
> index 9d899ed..9afacb6 100644
> --- a/pci/hda/patch_conexant.c
> +++ b/pci/hda/patch_conexant.c
> @@ -682,11 +682,13 @@ static struct hda_input_mux cxt5045_capture_source = {
>  };
>  
>  static struct hda_input_mux cxt5045_capture_source_benq = {
> -	.num_items = 3,
> +	.num_items = 5,
>  	.items = {
>  		{ "IntMic", 0x1 },
>  		{ "ExtMic", 0x2 },
>  		{ "LineIn", 0x3 },
> +		{ "CD Pin", 0x4 },
> +		{ "Mixer ", 0x0 },
>  	}
>  };
>  
> @@ -811,11 +813,19 @@ static struct snd_kcontrol_new cxt5045_mixers[] = {
>  };
>  
>  static struct snd_kcontrol_new cxt5045_benq_mixers[] = {
> +	HDA_CODEC_VOLUME("CD Audio Capture Volume", 0x1a, 0x04, HDA_INPUT),
> +	HDA_CODEC_MUTE("CD Audio Capture Switch", 0x1a, 0x04, HDA_INPUT),
> +	HDA_CODEC_VOLUME("CD Audio Playback Volume", 0x17, 0x4, HDA_INPUT),
> +	HDA_CODEC_MUTE("CD Audio Playback Switch", 0x17, 0x4, HDA_INPUT),
> +
>  	HDA_CODEC_VOLUME("Line In Capture Volume", 0x1a, 0x03, HDA_INPUT),
>  	HDA_CODEC_MUTE("Line In Capture Switch", 0x1a, 0x03, HDA_INPUT),
>  	HDA_CODEC_VOLUME("Line In Playback Volume", 0x17, 0x3, HDA_INPUT),
>  	HDA_CODEC_MUTE("Line In Playback Switch", 0x17, 0x3, HDA_INPUT),
>  
> +	HDA_CODEC_VOLUME("Mixer Capture Volume", 0x1a, 0x0, HDA_INPUT),
> +	HDA_CODEC_MUTE("Mixer Capture Switch", 0x1a, 0x0, HDA_INPUT),	
> +
>  	{}
>  };
>  
> -- 
> 1.6.0.4
>