Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 22e141300ec47010da2bfb03e1c0c74c3518ac7b

Authored by Lukasz Marcinowski
Committed by Takashi Iwai
1 parent b99dba34dc
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ALSA: hda - CD-audio sound for hda-intel conexant benq laptop 

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.

[Additional minor fixes of mixer element/item names by tiwai]

Signed-off-by: Lukasz Marcinowski <nowymarluk@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 1 changed file with 11 additions and 1 deletions Side-by-side Diff

sound/pci/hda/patch_conexant.c
Diff comments   View file @ 22e1413
... ... @@ -682,11 +682,13 @@
682 682 };
683 683  
684 684 static struct hda_input_mux cxt5045_capture_source_benq = {
685   - .num_items = 3,
  685 + .num_items = 5,
686 686 .items = {
687 687 { "IntMic", 0x1 },
688 688 { "ExtMic", 0x2 },
689 689 { "LineIn", 0x3 },
  690 + { "CD", 0x4 },
  691 + { "Mixer", 0x0 },
690 692 }
691 693 };
692 694  
693 695  
... ... @@ -811,10 +813,18 @@
811 813 };
812 814  
813 815 static struct snd_kcontrol_new cxt5045_benq_mixers[] = {
  816 + HDA_CODEC_VOLUME("CD Capture Volume", 0x1a, 0x04, HDA_INPUT),
  817 + HDA_CODEC_MUTE("CD Capture Switch", 0x1a, 0x04, HDA_INPUT),
  818 + HDA_CODEC_VOLUME("CD Playback Volume", 0x17, 0x4, HDA_INPUT),
  819 + HDA_CODEC_MUTE("CD Playback Switch", 0x17, 0x4, HDA_INPUT),
  820 +
814 821 HDA_CODEC_VOLUME("Line In Capture Volume", 0x1a, 0x03, HDA_INPUT),
815 822 HDA_CODEC_MUTE("Line In Capture Switch", 0x1a, 0x03, HDA_INPUT),
816 823 HDA_CODEC_VOLUME("Line In Playback Volume", 0x17, 0x3, HDA_INPUT),
817 824 HDA_CODEC_MUTE("Line In Playback Switch", 0x17, 0x3, HDA_INPUT),
  825 +
  826 + HDA_CODEC_VOLUME("Mixer Capture Volume", 0x1a, 0x0, HDA_INPUT),
  827 + HDA_CODEC_MUTE("Mixer Capture Switch", 0x1a, 0x0, HDA_INPUT),
818 828  
819 829 {}
820 830 };