summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2014-07-25 11:41:45 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2014-07-25 11:41:45 +0200
commitfff75b252e0aed1d8be2b62234624f726c153776 (patch)
treeb88a090b4057bfdff48d33eecc17039fcdc21dfa /sound
parent740730acf44eabb04a16f7468e4bc9843af5ee0f (diff)
apalis/colibri t30: 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 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).
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_intel.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index b005f550c146..8e7cd268b370 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -52,7 +52,13 @@
#include "hda_codec.h"
+#if !defined(CONFIG_MACH_APALIS_T30) && !defined(CONFIG_MACH_COLIBRI_T30)
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 int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
static char *model[SNDRV_CARDS];