Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6d7b1d7d09e00034325b09a3a7ac7b0ea5e29506

Authored by Takashi Iwai
Committed by Jaroslav Kysela
1 parent 8ad2da1937
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-codec - Allow model=generic always for generic parser 

Accept model=generic option to specify the generic parser regardless
of codec chips.  This is helpful for testing and debugging.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

Showing 2 changed files with 6 additions and 1 deletions Side-by-side Diff

Documentation/sound/alsa/ALSA-Configuration.txt
Diff comments   View file @ 6d7b1d7
... ... @@ -924,6 +924,10 @@
924 924 vaio Setup for VAIO FE550G/SZ110
925 925 vaio-ar Setup for VAIO AR
926 926  
  927 + The model name "genric" is treated as a special case. When this
  928 + model is given, the driver uses the generic codec parser without
  929 + "codec-patch". It's sometimes good for testing and debugging.
  930 +
927 931 If the default configuration doesn't work and one of the above
928 932 matches with your device, report it together with the PCI
929 933 subsystem ID (output of "lspci -nv") to ALSA BTS or alsa-devel
sound/pci/hda/hda_codec.c
Diff comments   View file @ 6d7b1d7
... ... @@ -573,7 +573,8 @@
573 573 0);
574 574 }
575 575  
576   - codec->preset = find_codec_preset(codec);
  576 + if (strcmp(codec->bus->modelname, "generic"))
  577 + codec->preset = find_codec_preset(codec);
577 578 if (! *bus->card->mixername)
578 579 snd_hda_get_codec_name(codec, bus->card->mixername,
579 580 sizeof(bus->card->mixername));