diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-07-25 11:41:45 +0200 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2016-06-29 16:48:54 +0200 |
commit | 74e367820da05b63c98460a9c3e91abab6d60b94 (patch) | |
tree | 6489c2f6adaf55d53bdae98200632f069870a0d0 /sound | |
parent | 5de693d85c6dc5ad49e55a3386ed336a3415cc0c (diff) |
apalis-tk1: make hda 2nd sound card hack
Hack HDA driver to make it the 2nd rather than the first sound card as
the first one should be the SGTL5000 which is always present on our T30
and TK1 modules. Especially on Ixora where there is no HDA codec on the
carrier board HDA being the first sound card does not make much sense
even more though as there was no primary device (e.g. device=hw:0,0).
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Dominik Sliwa <dominik.sliwa@toradex.com>
(cherry picked from commit fff75b252e0aed1d8be2b62234624f726c153776)
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index fe10a0dab604..5745a7d490a2 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -72,7 +72,13 @@ #include <linux/tegra_pm_domains.h> #endif +#ifndef CONFIG_MACH_APALIS_TK1 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; +#else +/* Hack to have HDA sound card as 2nd one in order to have SGTL5000 on our + modules show up as primary one */ +static int index[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 1}; +#endif static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; static char *model[SNDRV_CARDS]; |