From 5ba11d69dafbd4502469fd957b4580169779664c Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 12 Sep 2012 15:15:32 +0200
Subject: [PATCH] Add chmap override definitions for Emu10k1, Audigy and
 Audigy2 cards

These cards won't provide the channel maps from the driver itself
because of the dynamic routing.  For simplicity, define chmaps in the
configurations, so that chmap querying of individual stereo streams
and combined multi streams works properly.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 src/conf/cards/Audigy.conf  | 3 +++
 src/conf/cards/Audigy2.conf | 4 ++++
 src/conf/cards/EMU10K1.conf | 3 +++
 3 files changed, 10 insertions(+)

diff --git a/src/conf/cards/Audigy.conf b/src/conf/cards/Audigy.conf
index ea1e53da..e008b678 100644
--- a/src/conf/cards/Audigy.conf
+++ b/src/conf/cards/Audigy.conf
@@ -13,6 +13,7 @@ Audigy.pcm.front.0 {
 	slave.pcm {
 		type hw
 		card $CARD
+		chmap "FL,FR"
 	}
 	hooks.0 {
 		type ctl_elems
@@ -65,6 +66,7 @@ Audigy.pcm.rear.0 {
 	slave.pcm {
 		type hw
 		card $CARD
+		chmap "RL,RR"
 	}
 	hooks.0 {
 		type ctl_elems
@@ -100,6 +102,7 @@ Audigy.pcm.center_lfe.0 {
 	slave.pcm {
 		type hw
 		card $CARD
+		chmap "FC,LFE"
 	}
 	hooks.0 {
 		type ctl_elems
diff --git a/src/conf/cards/Audigy2.conf b/src/conf/cards/Audigy2.conf
index 0290f6f8..e34fadcf 100644
--- a/src/conf/cards/Audigy2.conf
+++ b/src/conf/cards/Audigy2.conf
@@ -13,6 +13,7 @@ Audigy2.pcm.front.0 {
 	slave.pcm {
 		type hw
 		card $CARD
+		chmap "FL,FR"
 	}
 	hooks.0 {
 		type ctl_elems
@@ -65,6 +66,7 @@ Audigy2.pcm.rear.0 {
 	slave.pcm {
 		type hw
 		card $CARD
+		chmap "RL,RR"
 	}
 	hooks.0 {
 		type ctl_elems
@@ -100,6 +102,7 @@ Audigy2.pcm.center_lfe.0 {
 	slave.pcm {
 		type hw
 		card $CARD
+		chmap "FC,LFE"
 	}
 	hooks.0 {
 		type ctl_elems
@@ -151,6 +154,7 @@ Audigy2.pcm.side.0 {
 	slave.pcm {
 		type hw
 		card $CARD
+		chmap "SL,SR"
 	}
 	hooks.0 {
 		type ctl_elems
diff --git a/src/conf/cards/EMU10K1.conf b/src/conf/cards/EMU10K1.conf
index 706da0ad..02a732fb 100644
--- a/src/conf/cards/EMU10K1.conf
+++ b/src/conf/cards/EMU10K1.conf
@@ -15,6 +15,7 @@ EMU10K1.pcm.front.0 {
 		slave.pcm {
 			type hw
 			card $CARD
+			chmap "FL,FR"
 		}
 		hooks.0 {
 			type ctl_elems
@@ -73,6 +74,7 @@ EMU10K1.pcm.rear.0 {
 		slave.pcm {
 			type hw
 			card $CARD
+			chmap "RL,RR"
 		}
 		hooks.0 {
 			type ctl_elems
@@ -111,6 +113,7 @@ EMU10K1.pcm.center_lfe.0 {
 		slave.pcm {
 			type hw
 			card $CARD
+			chmap "FC,LFE"
 		}
 		hooks.0 {
 			type ctl_elems