From 74e367820da05b63c98460a9c3e91abab6d60b94 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Fri, 25 Jul 2014 11:41:45 +0200 Subject: 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 Acked-by: Dominik Sliwa (cherry picked from commit fff75b252e0aed1d8be2b62234624f726c153776) --- sound/pci/hda/hda_intel.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'sound') 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 #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]; -- cgit v1.2.3