conf: Add surround 2.1 support to all cards

All cards that support 4.1 surround now also support 2.1 surround, because they both have surround 5.1 as slave. Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2025-10-29 05:40:25 -04:00 · 2014-02-18 16:41:49 +01:00 · 2014-02-18 16:41:49 +01:00 · 1af088e39b
commit 1af088e39b
parent 57b5076c30
28 changed files with 28 additions and 1 deletions
--- a/src/conf/cards/ATIIXP-SPDMA.conf
+++ b/src/conf/cards/ATIIXP-SPDMA.conf
@ -77,6 +77,7 @@ ATIIXP-SPDMA.pcm.surround40.0 {
 	}
 }

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/ATIIXP.conf
+++ b/src/conf/cards/ATIIXP.conf
@ -77,6 +77,7 @@ ATIIXP.pcm.surround40.0 {
 	}
 }

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/Audigy.conf
+++ b/src/conf/cards/Audigy.conf
@ -143,6 +143,7 @@ Audigy.pcm.center_lfe.0 {
 	}
 }	

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround40.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
--- a/src/conf/cards/Audigy2.conf
+++ b/src/conf/cards/Audigy2.conf
@ -195,6 +195,7 @@ Audigy2.pcm.side.0 {
 	}
 }

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround40.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
--- a/src/conf/cards/Aureon51.conf
+++ b/src/conf/cards/Aureon51.conf
@ -86,6 +86,7 @@ Aureon51.pcm.surround40.0 {
 	channels 4
 }	

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/Aureon71.conf
+++ b/src/conf/cards/Aureon71.conf
@ -86,6 +86,7 @@ Aureon71.pcm.surround40.0 {
 	channels 4
 }	

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/CA0106.conf
+++ b/src/conf/cards/CA0106.conf
@ -108,6 +108,7 @@ CA0106.pcm.surround40.0 {
 	]
 }

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/CMI8738-MC6.conf
+++ b/src/conf/cards/CMI8738-MC6.conf
@ -77,6 +77,7 @@ CMI8738-MC6.pcm.surround40.0 {
 	}
 }	

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/CMI8738-MC8.conf
+++ b/src/conf/cards/CMI8738-MC8.conf
@ -105,6 +105,7 @@ CMI8738-MC8.pcm.surround40.0 {
 }	


+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/CMI8788.conf
+++ b/src/conf/cards/CMI8788.conf
@ -48,7 +48,7 @@ CMI8788.pcm.surround40.0 {
 	channels 4
 }	

-
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/CS46xx.conf
+++ b/src/conf/cards/CS46xx.conf
@ -112,6 +112,7 @@ CS46xx.pcm.surround40.0 {
 	]
 }

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/EMU10K1.conf
+++ b/src/conf/cards/EMU10K1.conf
@ -217,6 +217,7 @@ EMU10K1.pcm.surround40.0 {
 	]
 }

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/EMU10K1X.conf
+++ b/src/conf/cards/EMU10K1X.conf
@ -96,6 +96,7 @@ EMU10K1X.pcm.surround40.0 {
 	]
 }

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/FM801.conf
+++ b/src/conf/cards/FM801.conf
@ -40,6 +40,7 @@ FM801.pcm.default {

 FM801.pcm.surround40.0 "cards.FM801.pcm.front.0"

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/FireWave.conf
+++ b/src/conf/cards/FireWave.conf
@ -25,6 +25,7 @@ FireWave.pcm.front.0 {
 	card $CARD
 }

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/HDA-Intel.conf
+++ b/src/conf/cards/HDA-Intel.conf
@ -71,6 +71,7 @@ HDA-Intel.pcm.default {
 	hint.device 0
 }

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround40.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
--- a/src/conf/cards/ICE1712.conf
+++ b/src/conf/cards/ICE1712.conf
@ -74,6 +74,7 @@ ICE1712.pcm.surround40.0 {
 	slave.channels 10
 }	

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/ICE1724.conf
+++ b/src/conf/cards/ICE1724.conf
@ -95,6 +95,7 @@ ICE1724.pcm.surround40.0 {
 	}
 }	

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/ICH.conf
+++ b/src/conf/cards/ICH.conf
@ -98,6 +98,7 @@ ICH.pcm.surround40.0 {
 	}
 }

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/ICH4.conf
+++ b/src/conf/cards/ICH4.conf
@ -98,6 +98,7 @@ ICH4.pcm.surround40.0 {
 	}
 }

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/Loopback.conf
+++ b/src/conf/cards/Loopback.conf
@ -63,6 +63,7 @@ Loopback.pcm.default {
 	hint.device 0
 }

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround40.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
--- a/src/conf/cards/NFORCE.conf
+++ b/src/conf/cards/NFORCE.conf
@ -98,6 +98,7 @@ NFORCE.pcm.surround40.0 {
 	}
 }

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/SB-XFi.conf
+++ b/src/conf/cards/SB-XFi.conf
@ -53,6 +53,7 @@ SB-XFi.pcm.side.0 {
 	hint.device 3
 }	

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround40.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
--- a/src/conf/cards/SI7018.conf
+++ b/src/conf/cards/SI7018.conf
@ -78,6 +78,7 @@ SI7018.pcm.surround40.0 {
 	]
 }

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/USB-Audio.conf
+++ b/src/conf/cards/USB-Audio.conf
@ -314,6 +314,7 @@ USB-Audio.pcm.surround40_two_stereo_devices {
 	}
 }

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/VIA8233.conf
+++ b/src/conf/cards/VIA8233.conf
@ -86,6 +86,7 @@ VIA8233.pcm.surround40.0 {
 	}
 }

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/VIA8233A.conf
+++ b/src/conf/cards/VIA8233A.conf
@ -84,6 +84,7 @@ VIA8233A.pcm.surround40.0 {
 	}
 }

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
--- a/src/conf/cards/VIA8237.conf
+++ b/src/conf/cards/VIA8237.conf
@ -79,6 +79,7 @@ VIA8237.pcm.surround40.0 {
 	}
 }

+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>