ucm2: treewide - remove Playback and Capture channels=2 assignments

The value 2 is the default.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/DB410c/HDMI.conf b/ucm2/DB410c/HDMI.conf
index fa44132227ffeb8f6d8bdd37072de8cd0829a271..3335422f9a9069aa5dd21deb7aae3441f1aebaa4 100644 (file)
--- a/ucm2/DB410c/HDMI.conf
+++ b/ucm2/DB410c/HDMI.conf
@@ -4,7 +4,6 @@
 SectionVerb {
        Value {
                TQ "HiFi"
-               PlaybackChannels 2
        }
 }
 

diff --git a/ucm2/DB410c/HiFi.conf b/ucm2/DB410c/HiFi.conf
index 1b2716ab8bf170207dca23b81e839612a4165722..62ddc8e1eb35adce7dc9c2d271332e55ad1d253b 100644 (file)
--- a/ucm2/DB410c/HiFi.conf
+++ b/ucm2/DB410c/HiFi.conf
@@ -1,14 +1,6 @@
 # Use case configuration for DB410c board.
 # Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
 
-SectionVerb {
-       Value {
-               PlaybackChannels 2
-               CaptureChannels 2
-       }
-}
-
-
 SectionDevice."Speaker" {
        Comment "Speaker playback"
 
@@ -35,7 +27,6 @@ SectionDevice."Speaker" {
        }
 }
 
-
 SectionDevice."Headphones" {
        Comment "Headphones playback"
 

diff --git a/ucm2/DB820c/HDMI.conf b/ucm2/DB820c/HDMI.conf
index c0d40f690f6661a83706bdcdebc0ad0f3b32eccc..f0ca015c66324d635d186392ff979432c5233b87 100644 (file)
--- a/ucm2/DB820c/HDMI.conf
+++ b/ucm2/DB820c/HDMI.conf
@@ -29,6 +29,5 @@ SectionDevice."HDMI" {
         Value {
                PlaybackPriority 200
                PlaybackPCM "plughw:${CardId}"
-               PlaybackChannels 2
         }
 }

diff --git a/ucm2/DB820c/HiFi.conf b/ucm2/DB820c/HiFi.conf
index 501c263bc64845c5c543fc5409e6de4479897d94..89280d72450c59a44d674b9dde37c0ad6facc0c9 100644 (file)
--- a/ucm2/DB820c/HiFi.conf
+++ b/ucm2/DB820c/HiFi.conf
@@ -69,7 +69,6 @@ SectionDevice."Headphones" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "plughw:${CardId},1"
-               PlaybackChannels 2
        }
 }
 

diff --git a/ucm2/HDA-Intel/HiFi-dual.conf b/ucm2/HDA-Intel/HiFi-dual.conf
index 846c6db75a51fd7e3d58e826f1b1a61d9bac9407..174fef4787b198ab83482b361c921bd2568069ca 100644 (file)
--- a/ucm2/HDA-Intel/HiFi-dual.conf
+++ b/ucm2/HDA-Intel/HiFi-dual.conf
@@ -1,8 +1,6 @@
 SectionVerb {
        Value {
                TQ "HiFi"
-               PlaybackChannels 2
-               CaptureChannels 2
        }
 
        EnableSequence [

diff --git a/ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf b/ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf
index 37b7e0d11b826af26917ea924dbedf1a9f3c4b1a..2f625e437b5714da7c38cbe4ceaa835fb90bca81 100644 (file)
--- a/ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf
+++ b/ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf
@@ -3,7 +3,6 @@ SectionDevice."Headphones" {
 
        Value {
                PlaybackPriority 100
-               PlaybackChannels 2
                PlaybackPCM "hw:${CardId}"
        }
 }
@@ -13,7 +12,6 @@ SectionDevice."Line" {
 
        Value {
                PlaybackPriority 200
-               PlaybackChannels 2
                PlaybackPCM "hw:${CardId},1"
        }
 }
@@ -23,7 +21,6 @@ SectionDevice."Mic" {
 
        Value {
                CapturePriority 100
-               CaptureChannels 2
                CapturePCM "hw:${CardId}"
        }
 }

diff --git a/ucm2/broadwell-rt286/HiFi.conf b/ucm2/broadwell-rt286/HiFi.conf
index 96b89a0ff0d0a6972aa2c8b49c84aea5aaffba39..611a03ec5f8a177ef309f8b75d66226c5c55d853 100644 (file)
--- a/ucm2/broadwell-rt286/HiFi.conf
+++ b/ucm2/broadwell-rt286/HiFi.conf
@@ -23,7 +23,6 @@ SectionDevice."Speaker" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
                PlaybackMixerElem "DAC0"
                PlaybackMasterElem "Master"
        }
@@ -51,7 +50,6 @@ SectionDevice."Headphones" {
        Value {
                PlaybackPriority 200
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
                PlaybackMixerElem "DAC0"
                PlaybackMasterElem "Master"
                JackDev "rt286-jack"
@@ -78,7 +76,6 @@ SectionDevice."Mic" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
                CaptureMixerElem "Mic"
                CaptureMasterElem "ADC0"
        }
@@ -103,7 +100,6 @@ SectionDevice."Handset" {
        Value {
                CapturePriority 200
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
                CaptureMixerElem "Mic"
                CaptureMasterElem "ADC0"
                JackDev "rt286-jack"

diff --git a/ucm2/broxton-rt298/broxton-rt298.conf b/ucm2/broxton-rt298/broxton-rt298.conf
index 1332dc5e55a9fbc60c2a5513bfdf59ba704faf06..95f9ac51522a344b233eb5c4efdd3d4b550654f8 100644 (file)
--- a/ucm2/broxton-rt298/broxton-rt298.conf
+++ b/ucm2/broxton-rt298/broxton-rt298.conf
@@ -8,13 +8,6 @@ SectionUseCase."HiFi" {
        Comment "Play and record HiFi quality Music"
 }
 
-ValueDefaults {
-       PlaybackChannels 2
-       PlaybackPriority 1
-       CaptureChannels 2
-       CapturePriority 2
-}
-
 SectionDefaults [
        cset "name='Headphone Jack Switch' 1"
        cset "name='Speaker Switch' 1"

diff --git a/ucm2/chtrt5645/HiFi-dmic1.conf b/ucm2/chtrt5645/HiFi-dmic1.conf
index 4748bd9315ca9d24f799e1924194983c53c9c8f1..1a8ee0abdadf9498075f007ed11a049afadb6fc6 100644 (file)
--- a/ucm2/chtrt5645/HiFi-dmic1.conf
+++ b/ucm2/chtrt5645/HiFi-dmic1.conf
@@ -27,7 +27,6 @@ SectionDevice."Speaker" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
        }
 
        ConflictingDevice [
@@ -50,7 +49,6 @@ SectionDevice."Headphones" {
        Value {
                PlaybackPriority 200
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
                JackControl "Headphone Jack"
                JackHWMute "Speaker"
        }
@@ -75,7 +73,6 @@ SectionDevice."Mic" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
        }
 
        EnableSequence [
@@ -98,7 +95,6 @@ SectionDevice."Headset" {
        Value {
                CapturePriority 200
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
                JackControl "Headset Mic Jack"
                JackHWMute "Mic"
        }

diff --git a/ucm2/chtrt5645/HiFi-dmic2.conf b/ucm2/chtrt5645/HiFi-dmic2.conf
index 459b9f5785664f7dfd0015b899912040662188f8..c9fdd79e4cd09a03342c7676bb4f8d8402e65d42 100644 (file)
--- a/ucm2/chtrt5645/HiFi-dmic2.conf
+++ b/ucm2/chtrt5645/HiFi-dmic2.conf
@@ -27,7 +27,6 @@ SectionDevice."Speaker" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
        }
 
        ConflictingDevice [
@@ -50,7 +49,6 @@ SectionDevice."Headphones" {
        Value {
                PlaybackPriority 200
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
                JackControl "Headphone Jack"
                JackHWMute "Speaker"
        }
@@ -75,7 +73,6 @@ SectionDevice."Mic" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
        }
 
        EnableSequence [
@@ -100,7 +97,6 @@ SectionDevice."Headset" {
        Value {
                CapturePriority 200
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
                JackControl "Headset Mic Jack"
                JackHWMute "DMic"
        }

diff --git a/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf b/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf
index fe410f37818dd08a45f29f9e60b6b01ae78bdb30..db866cd5c67a0e26b8529298112ab8a543237d29 100644 (file)
--- a/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf
+++ b/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf
@@ -27,7 +27,6 @@ SectionDevice."Speaker" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
        }
 
        ConflictingDevice [
@@ -54,7 +53,6 @@ SectionDevice."Headphones" {
        Value {
                PlaybackPriority 200
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
                JackControl "Headphone Jack"
                JackHWMute "Speaker"
        }
@@ -85,7 +83,6 @@ SectionDevice."Headset" {
        Value {
                CapturePriority 200
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
                JackControl "Headset Mic Jack"
                JackHWMute "Mic"
        }

diff --git a/ucm2/chtrt5645/HiFi.conf b/ucm2/chtrt5645/HiFi.conf
index 954bf68d3032af559d42ad8506aadc4a00338ab7..58468a8ddd02cf93e2e5cf98dbf5ee28e56b2def 100644 (file)
--- a/ucm2/chtrt5645/HiFi.conf
+++ b/ucm2/chtrt5645/HiFi.conf
@@ -27,7 +27,6 @@ SectionDevice."Speaker" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
        }
 
        ConflictingDevice [
@@ -50,7 +49,6 @@ SectionDevice."Headphones" {
        Value {
                PlaybackPriority 200
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
                JackControl "Headphone Jack"
                JackHWMute "Speaker"
        }
@@ -77,7 +75,6 @@ SectionDevice."Headset" {
        Value {
                CapturePriority 200
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
                JackControl "Headset Mic Jack"
                JackHWMute "Mic"
        }

diff --git a/ucm2/codecs/cx2072x/HeadPhones.conf b/ucm2/codecs/cx2072x/HeadPhones.conf
index 484d020be7e890c6ab556512896fba321f45cd4a..adb70db66fdfb781ff0cc20da0c464b6df058111 100644 (file)
--- a/ucm2/codecs/cx2072x/HeadPhones.conf
+++ b/ucm2/codecs/cx2072x/HeadPhones.conf
@@ -18,7 +18,6 @@ SectionDevice."Headphones" {
        Value {
                PlaybackPriority 200
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
                JackControl "Headphone Jack"
        }
 }

diff --git a/ucm2/codecs/cx2072x/HeadsetMic.conf b/ucm2/codecs/cx2072x/HeadsetMic.conf
index b1a777114df4ff470a4bd9483d61580fc0879b67..5a6643e834dc25bd63c7809aed0931113ccea1a8 100644 (file)
--- a/ucm2/codecs/cx2072x/HeadsetMic.conf
+++ b/ucm2/codecs/cx2072x/HeadsetMic.conf
@@ -19,7 +19,6 @@ SectionDevice."Headset" {
        Value {
                CapturePriority 200
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
                JackControl "Headset Mic Jack"
        }
 }

diff --git a/ucm2/codecs/cx2072x/InternalMic.conf b/ucm2/codecs/cx2072x/InternalMic.conf
index 831c3cc63f5cb65408aaaed4fdc6163da1c4a5d8..9c083be485439a0b8f6b803599e64c9a26b50961 100644 (file)
--- a/ucm2/codecs/cx2072x/InternalMic.conf
+++ b/ucm2/codecs/cx2072x/InternalMic.conf
@@ -19,6 +19,5 @@ SectionDevice."Mic" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/cx2072x/Speaker.conf b/ucm2/codecs/cx2072x/Speaker.conf
index f60e3559d1f7bf78f2f991fdd007ad64343a71ed..a641ba259136b119859f32004978d75791cfd777 100644 (file)
--- a/ucm2/codecs/cx2072x/Speaker.conf
+++ b/ucm2/codecs/cx2072x/Speaker.conf
@@ -18,6 +18,5 @@ SectionDevice."Speaker" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
        }
 }

diff --git a/ucm2/codecs/es8316/HeadPhones.conf b/ucm2/codecs/es8316/HeadPhones.conf
index 6a05e5488979a8f57601286e7388b3cf8f35f243..b68569a9447bb7a66d78ca83c8214d06cbcb5dca 100644 (file)
--- a/ucm2/codecs/es8316/HeadPhones.conf
+++ b/ucm2/codecs/es8316/HeadPhones.conf
@@ -16,7 +16,6 @@ SectionDevice."Headphones" {
        Value {
                PlaybackPriority 200
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
                JackControl "Headphone Jack"
                JackHWMute "Speaker"
        }

diff --git a/ucm2/codecs/es8316/IN1-HeadsetMic.conf b/ucm2/codecs/es8316/IN1-HeadsetMic.conf
index e9f90614c6461a5d59bbee28b311b96ce7ace1e5..a76b27585a3b14b1237afd60157c8f3ccbc92144 100644 (file)
--- a/ucm2/codecs/es8316/IN1-HeadsetMic.conf
+++ b/ucm2/codecs/es8316/IN1-HeadsetMic.conf
@@ -17,7 +17,6 @@ SectionDevice."Headset" {
        Value {
                CapturePriority 200
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
                JackControl "Headset Mic Jack"
        }
 }

diff --git a/ucm2/codecs/es8316/IN1-InternalMic.conf b/ucm2/codecs/es8316/IN1-InternalMic.conf
index 31c5cda6a314416c1e68cb867edab0dbbd7e30fa..ede0a8cdd550d6ee97e53a2fcb154960316eb382 100644 (file)
--- a/ucm2/codecs/es8316/IN1-InternalMic.conf
+++ b/ucm2/codecs/es8316/IN1-InternalMic.conf
@@ -17,6 +17,5 @@ SectionDevice."Mic" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/es8316/IN2-HeadsetMic.conf b/ucm2/codecs/es8316/IN2-HeadsetMic.conf
index 377d84d3a0f2c10f5b27df70c3ee2c5c9b045267..b114c864811c701bf55b0fd98e9370edb9ba3310 100644 (file)
--- a/ucm2/codecs/es8316/IN2-HeadsetMic.conf
+++ b/ucm2/codecs/es8316/IN2-HeadsetMic.conf
@@ -17,7 +17,6 @@ SectionDevice."Headset" {
        Value {
                CapturePriority 200
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
                JackControl "Headset Mic Jack"
        }
 }

diff --git a/ucm2/codecs/es8316/IN2-InternalMic.conf b/ucm2/codecs/es8316/IN2-InternalMic.conf
index f0ff6f183f5ae81b69eac96025fcc05415a54408..c8fce625dfe6cb3f64405d76cb5663628625c0ad 100644 (file)
--- a/ucm2/codecs/es8316/IN2-InternalMic.conf
+++ b/ucm2/codecs/es8316/IN2-InternalMic.conf
@@ -17,6 +17,5 @@ SectionDevice."Mic" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/es8316/MonoSpeaker.conf b/ucm2/codecs/es8316/MonoSpeaker.conf
index 64a7e76046a024966584f419001ebbbd64bff2d4..f5f42737f1fdb6352427d77c0eaa916f354dc21d 100644 (file)
--- a/ucm2/codecs/es8316/MonoSpeaker.conf
+++ b/ucm2/codecs/es8316/MonoSpeaker.conf
@@ -33,6 +33,5 @@ SectionDevice."Speaker" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
        }
 }

diff --git a/ucm2/codecs/es8316/Speaker.conf b/ucm2/codecs/es8316/Speaker.conf
index 58fe078409eeb91fa9df2561558061beeb634694..03c21b31ef3933b05ebabe30a3d20930697b3b07 100644 (file)
--- a/ucm2/codecs/es8316/Speaker.conf
+++ b/ucm2/codecs/es8316/Speaker.conf
@@ -16,6 +16,5 @@ SectionDevice."Speaker" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
        }
 }

diff --git a/ucm2/codecs/nau8824/HeadPhones.conf b/ucm2/codecs/nau8824/HeadPhones.conf
index 6623365af66ef9b2757252ce6328c78456446739..a807f846f1f92a2734e950a87c9685471cdc41cb 100644 (file)
--- a/ucm2/codecs/nau8824/HeadPhones.conf
+++ b/ucm2/codecs/nau8824/HeadPhones.conf
@@ -4,7 +4,6 @@ SectionDevice."Headphones" {
        Value {
                PlaybackPriority 200
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
                JackControl "Headphone Jack"
        }
 

diff --git a/ucm2/codecs/nau8824/HeadsetMic.conf b/ucm2/codecs/nau8824/HeadsetMic.conf
index 738163861d69b394a37f34c104200f656dd86b1e..1129a6bc0490688aaa523b91f83da23c9ebea506 100644 (file)
--- a/ucm2/codecs/nau8824/HeadsetMic.conf
+++ b/ucm2/codecs/nau8824/HeadsetMic.conf
@@ -4,7 +4,6 @@ SectionDevice."Headset" {
        Value {
                CapturePriority 300
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
                JackControl "Headset Mic Jack"
        }
 

diff --git a/ucm2/codecs/nau8824/InternalMic.conf b/ucm2/codecs/nau8824/InternalMic.conf
index 731a261cf93a2a81d371aaec7d2e2648094508e2..409f01b8f11619fcba7d89cae3e86e45995be3b2 100644 (file)
--- a/ucm2/codecs/nau8824/InternalMic.conf
+++ b/ucm2/codecs/nau8824/InternalMic.conf
@@ -4,7 +4,6 @@ SectionDevice."Mic" {
        Value {
                CapturePriority 200
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
        }
 
        ConflictingDevice [

diff --git a/ucm2/codecs/nau8824/MonoSpeaker.conf b/ucm2/codecs/nau8824/MonoSpeaker.conf
index b02a22cb682e2b4bfad050833ede74c1f80cf0df..6b4ef8a9f6cfc7693dfd5d5189c4b1e3414b9122 100644 (file)
--- a/ucm2/codecs/nau8824/MonoSpeaker.conf
+++ b/ucm2/codecs/nau8824/MonoSpeaker.conf
@@ -4,7 +4,6 @@ SectionDevice."Speaker" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
        }
 
        ConflictingDevice [

diff --git a/ucm2/codecs/nau8824/Speaker.conf b/ucm2/codecs/nau8824/Speaker.conf
index 365879585a98c4451ced4e5aff867468d24315cc..a995873eda317a3259980ce62bc0e7912874f8ac 100644 (file)
--- a/ucm2/codecs/nau8824/Speaker.conf
+++ b/ucm2/codecs/nau8824/Speaker.conf
@@ -4,7 +4,6 @@ SectionDevice."Speaker" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
        }
 
        ConflictingDevice [

diff --git a/ucm2/codecs/rt5640/DigitalMics.conf b/ucm2/codecs/rt5640/DigitalMics.conf
index 9cd8a8c4d9cd1caec4443651041381d6ace88958..503c4a9cd7bf9efaca568b84d641c01125ba615e 100644 (file)
--- a/ucm2/codecs/rt5640/DigitalMics.conf
+++ b/ucm2/codecs/rt5640/DigitalMics.conf
@@ -22,6 +22,5 @@ SectionDevice."Mic" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5640/HeadPhones.conf b/ucm2/codecs/rt5640/HeadPhones.conf
index 7859b7a6bfb3021dfbac55fc8e60673c468c3f15..42151d6e2e179977fd2b0e872d53f351555c5ce8 100644 (file)
--- a/ucm2/codecs/rt5640/HeadPhones.conf
+++ b/ucm2/codecs/rt5640/HeadPhones.conf
@@ -33,7 +33,6 @@ SectionDevice."Headphones" {
        Value {
                PlaybackPriority 300
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
                JackControl "Headphone Jack"
        }
 }

diff --git a/ucm2/codecs/rt5640/HeadsetMic.conf b/ucm2/codecs/rt5640/HeadsetMic.conf
index 40e0abedd5f70e319c02965c6cdcf289bbab320a..7a8dfb8df6cc9ad8d6a562c23748500e428dbbab 100644 (file)
--- a/ucm2/codecs/rt5640/HeadsetMic.conf
+++ b/ucm2/codecs/rt5640/HeadsetMic.conf
@@ -38,7 +38,6 @@ SectionDevice."Headset" {
        Value {
                CapturePriority 200
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
                JackControl "Headset Mic Jack"
        }
 }

diff --git a/ucm2/codecs/rt5640/IN1-InternalMic.conf b/ucm2/codecs/rt5640/IN1-InternalMic.conf
index 7d76c4f17d41fa6a5721e305a0e6d86b2b345885..ebb5b6de426f0d51fb81a3a9d74a6996b4c8266b 100644 (file)
--- a/ucm2/codecs/rt5640/IN1-InternalMic.conf
+++ b/ucm2/codecs/rt5640/IN1-InternalMic.conf
@@ -41,6 +41,5 @@ SectionDevice."Mic" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5640/IN3-InternalMic.conf b/ucm2/codecs/rt5640/IN3-InternalMic.conf
index 2df29386d1f855e76061122f8c1200d1879f3396..172d90961de00b43647f6b8655a854df21be2609 100644 (file)
--- a/ucm2/codecs/rt5640/IN3-InternalMic.conf
+++ b/ucm2/codecs/rt5640/IN3-InternalMic.conf
@@ -41,6 +41,5 @@ SectionDevice."Mic" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5640/MonoSpeaker.conf b/ucm2/codecs/rt5640/MonoSpeaker.conf
index 70ab80922fb1cb100cbef4472b50d59d48cfc1ab..ddc7ba85cddd3191716809efb7b9dbd1886b1edf 100644 (file)
--- a/ucm2/codecs/rt5640/MonoSpeaker.conf
+++ b/ucm2/codecs/rt5640/MonoSpeaker.conf
@@ -38,6 +38,5 @@ SectionDevice."Speaker" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5640/Speaker.conf b/ucm2/codecs/rt5640/Speaker.conf
index 3b4b2968fb56c67313aaf5680fe53f3da0a24fdd..411cd13db1ff197a29b1381dc2866b38e4b5838c 100644 (file)
--- a/ucm2/codecs/rt5640/Speaker.conf
+++ b/ucm2/codecs/rt5640/Speaker.conf
@@ -38,6 +38,5 @@ SectionDevice."Speaker" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5645/AnalogMic.conf b/ucm2/codecs/rt5645/AnalogMic.conf
index 5583cdb8cddb8d7cdf805fae8b7ea493cf4e1c40..17938802a52e3781273286769f58451474ccdff9 100644 (file)
--- a/ucm2/codecs/rt5645/AnalogMic.conf
+++ b/ucm2/codecs/rt5645/AnalogMic.conf
@@ -4,7 +4,6 @@ SectionDevice."Mic" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
        }
 
        EnableSequence [

diff --git a/ucm2/codecs/rt5651/DigitalMic.conf b/ucm2/codecs/rt5651/DigitalMic.conf
index fa1de4c2afb7161a615df6fdbf1b5ff57f3cc112..aa40c1c2efeb9f9244092f7fed7e63303e763c36 100644 (file)
--- a/ucm2/codecs/rt5651/DigitalMic.conf
+++ b/ucm2/codecs/rt5651/DigitalMic.conf
@@ -16,6 +16,5 @@ SectionDevice."Mic" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5651/HeadPhones-swapped.conf b/ucm2/codecs/rt5651/HeadPhones-swapped.conf
index 7e91aa271345435417f7d4694175dead85c5a451..595f29c78dbcb373ce9c55645558dd028c9df858 100644 (file)
--- a/ucm2/codecs/rt5651/HeadPhones-swapped.conf
+++ b/ucm2/codecs/rt5651/HeadPhones-swapped.conf
@@ -33,7 +33,6 @@ SectionDevice."Headphones" {
 
        Value {
                PlaybackPriority 200
-               PlaybackChannels 2
                PlaybackPCM "hw:${CardId}"
                JackControl "Headphone Jack"
        }

diff --git a/ucm2/codecs/rt5651/HeadPhones.conf b/ucm2/codecs/rt5651/HeadPhones.conf
index 18a41082b78f9315f870485b3de119be5d48ea31..266c8519629cb8325ca341675ea76876391f5e36 100644 (file)
--- a/ucm2/codecs/rt5651/HeadPhones.conf
+++ b/ucm2/codecs/rt5651/HeadPhones.conf
@@ -25,7 +25,6 @@ SectionDevice."Headphones" {
        Value {
                PlaybackPriority 200
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
                JackControl "Headphone Jack"
        }
 }

diff --git a/ucm2/codecs/rt5651/IN1-InternalMic.conf b/ucm2/codecs/rt5651/IN1-InternalMic.conf
index 13c7cb6137af0d5de93c65ad115c46a256040dee..faa0bfa36e14a6ea8f83f7356373761fdae0f09f 100644 (file)
--- a/ucm2/codecs/rt5651/IN1-InternalMic.conf
+++ b/ucm2/codecs/rt5651/IN1-InternalMic.conf
@@ -20,6 +20,5 @@ SectionDevice."Mic" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5651/IN12-InternalMic.conf b/ucm2/codecs/rt5651/IN12-InternalMic.conf
index e0175418b0591fe09ddb6e2990858c60241024f5..79c72a3edee278d10fe21cf0723bb8f9313bf0e2 100644 (file)
--- a/ucm2/codecs/rt5651/IN12-InternalMic.conf
+++ b/ucm2/codecs/rt5651/IN12-InternalMic.conf
@@ -24,6 +24,5 @@ SectionDevice."Mic" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5651/IN2-HeadsetMic.conf b/ucm2/codecs/rt5651/IN2-HeadsetMic.conf
index 5b514390a17839e034c72c1294839693c12b3fca..86bbacbe482884b73eaa3fcc2471d88fe41ea978 100644 (file)
--- a/ucm2/codecs/rt5651/IN2-HeadsetMic.conf
+++ b/ucm2/codecs/rt5651/IN2-HeadsetMic.conf
@@ -24,7 +24,6 @@ SectionDevice."Headset" {
        Value {
                CapturePriority 200
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
                JackControl "Headset Mic Jack"
        }
 }

diff --git a/ucm2/codecs/rt5651/IN2-InternalMic.conf b/ucm2/codecs/rt5651/IN2-InternalMic.conf
index 9eeef4d0b5a3430dfa41420e6672822e066ddddf..da15a6d9988baf6ed80d81f5eb48b46a55d07007 100644 (file)
--- a/ucm2/codecs/rt5651/IN2-InternalMic.conf
+++ b/ucm2/codecs/rt5651/IN2-InternalMic.conf
@@ -20,6 +20,5 @@ SectionDevice."Mic" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5651/IN3-HeadsetMic.conf b/ucm2/codecs/rt5651/IN3-HeadsetMic.conf
index d579dcd8504e2c2941104d26c6fc5d0368dd4076..a40fefcca50eee106bdfcdc68393a74f6d1a9c14 100644 (file)
--- a/ucm2/codecs/rt5651/IN3-HeadsetMic.conf
+++ b/ucm2/codecs/rt5651/IN3-HeadsetMic.conf
@@ -24,7 +24,6 @@ SectionDevice."Headset" {
        Value {
                CapturePriority 200
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
                JackControl "Headset Mic Jack"
        }
 }

diff --git a/ucm2/codecs/rt5651/MonoSpeaker.conf b/ucm2/codecs/rt5651/MonoSpeaker.conf
index 9c780a0bbf52fde5ac9e26fa0c7f0916f65c53ee..a83b4815c50f60466938fd112f6cbc0dad444ca4 100644 (file)
--- a/ucm2/codecs/rt5651/MonoSpeaker.conf
+++ b/ucm2/codecs/rt5651/MonoSpeaker.conf
@@ -43,6 +43,5 @@ SectionDevice."Speaker" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5651/Speaker.conf b/ucm2/codecs/rt5651/Speaker.conf
index efc12e54fc8b62fa3267922d182c84684e4cabfd..18308b48f98035a7fe448950e9d6bc82c48a981b 100644 (file)
--- a/ucm2/codecs/rt5651/Speaker.conf
+++ b/ucm2/codecs/rt5651/Speaker.conf
@@ -25,6 +25,5 @@ SectionDevice."Speaker" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5672/DMIC1.conf b/ucm2/codecs/rt5672/DMIC1.conf
index 73983af48a37a0ee72b3b3f16f7f92dfaaf163af..201828367dde78878d2646679896d51c931dd2ce 100644 (file)
--- a/ucm2/codecs/rt5672/DMIC1.conf
+++ b/ucm2/codecs/rt5672/DMIC1.conf
@@ -23,6 +23,5 @@ SectionDevice."Mic1" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5672/DMIC2.conf b/ucm2/codecs/rt5672/DMIC2.conf
index 751c95cf22f11a9a19db800b16b883c8175b7243..48e61705b5f61ccb18749d80097c39d004cba94f 100644 (file)
--- a/ucm2/codecs/rt5672/DMIC2.conf
+++ b/ucm2/codecs/rt5672/DMIC2.conf
@@ -23,6 +23,5 @@ SectionDevice."Mic2" {
        Value {
                CapturePriority 200
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5672/HeadPhones.conf b/ucm2/codecs/rt5672/HeadPhones.conf
index 0542f7790052101e8d62a5b3d2f6a5885685e012..2c8d6e8372b309b319002aa3b8d7937b46a1259a 100644 (file)
--- a/ucm2/codecs/rt5672/HeadPhones.conf
+++ b/ucm2/codecs/rt5672/HeadPhones.conf
@@ -17,7 +17,6 @@ SectionDevice."Headphones" {
        Value {
                PlaybackPriority 300
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
                JackControl "Headphone Jack"
        }
 }

diff --git a/ucm2/codecs/rt5672/HeadsetMic.conf b/ucm2/codecs/rt5672/HeadsetMic.conf
index f407579b302d9793e64807a1f53ce79f0a969bbc..a764d82d6110dac3e8f6f99af02a8543603d11d7 100644 (file)
--- a/ucm2/codecs/rt5672/HeadsetMic.conf
+++ b/ucm2/codecs/rt5672/HeadsetMic.conf
@@ -32,7 +32,6 @@ SectionDevice."Headset" {
        Value {
                CapturePriority 300
                CapturePCM "hw:${CardId}"
-               CaptureChannels 2
                JackControl "Headset Mic Jack"
        }
 }

diff --git a/ucm2/codecs/rt5672/MonoSpeaker.conf b/ucm2/codecs/rt5672/MonoSpeaker.conf
index 0849c6744beab0f3dab4e7ef0fe5df0c33dfb723..f08c9c6de12c3a2d534804d39c8a235f95b41da5 100644 (file)
--- a/ucm2/codecs/rt5672/MonoSpeaker.conf
+++ b/ucm2/codecs/rt5672/MonoSpeaker.conf
@@ -21,6 +21,5 @@ SectionDevice."Speaker2" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5672/Speaker.conf b/ucm2/codecs/rt5672/Speaker.conf
index 44e73aa875c32635a07c8ee1d1ae054c9e331a66..8b7bcf88e964e30278edf5e0d7628659688cfce2 100644 (file)
--- a/ucm2/codecs/rt5672/Speaker.conf
+++ b/ucm2/codecs/rt5672/Speaker.conf
@@ -17,6 +17,5 @@ SectionDevice."Speaker1" {
        Value {
                PlaybackPriority 200
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
        }
 }

diff --git a/ucm2/kblrt5660/Hdmi1.conf b/ucm2/kblrt5660/Hdmi1.conf
index ccf51183fdd3015c9da85a309a2ae30ffd384d5c..561946f1a8be08f58de344ff46944c7d23fef2ef 100755 (executable)
--- a/ucm2/kblrt5660/Hdmi1.conf
+++ b/ucm2/kblrt5660/Hdmi1.conf
@@ -7,7 +7,6 @@ SectionDevice."HDMI1" {
        Value {
                PlaybackPriority 200
                PlaybackPCM "hw:${CardId},2"
-               PlaybackChannels 2
                If.1 {
                        Condition {
                                Type ControlExists

diff --git a/ucm2/kblrt5660/Hdmi2.conf b/ucm2/kblrt5660/Hdmi2.conf
index c5e400166ed7ba53d8d4f8ecabaa49f2e567eed9..756a3464dfbb9f15c739b395f4c41e9e7a74ddf8 100755 (executable)
--- a/ucm2/kblrt5660/Hdmi2.conf
+++ b/ucm2/kblrt5660/Hdmi2.conf
@@ -7,7 +7,6 @@ SectionDevice."HDMI2" {
        Value {
                PlaybackPriority 300
                PlaybackPCM "hw:${CardId},3"
-               PlaybackChannels 2
                If.1 {
                        Condition {
                                Type ControlExists

diff --git a/ucm2/kblrt5660/HiFi.conf b/ucm2/kblrt5660/HiFi.conf
index 0f5d46dafb15b7bb4a03cf2285e85593a67ef005..c1e8a0f1821cb47a8557b144a9c2073d76e7e26b 100755 (executable)
--- a/ucm2/kblrt5660/HiFi.conf
+++ b/ucm2/kblrt5660/HiFi.conf
@@ -28,7 +28,6 @@ SectionDevice."Line1" {
        Value {
                PlaybackPriority 100
                PlaybackPCM "hw:${CardId}"
-               PlaybackChannels 2
                JackDev "rt5660-jack"
                JackControl "Line Out Jack"
        }
@@ -61,7 +60,6 @@ SectionDevice."Line2" {
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId},1"             
-               CaptureChannels 2
                JackDev "rt5660-jack"
                JackControl "Line In Jack"
        }

diff --git a/ucm2/skylake-rt286/skylake-rt286.conf b/ucm2/skylake-rt286/skylake-rt286.conf
index 4ea57773cd2a93e6a88bf3060edc26446599c4e8..97f2a7c6e594733feb7398bf5dde9195a3d7211f 100644 (file)
--- a/ucm2/skylake-rt286/skylake-rt286.conf
+++ b/ucm2/skylake-rt286/skylake-rt286.conf
@@ -8,11 +8,6 @@ SectionUseCase."HiFi" {
        Comment "Play and record HiFi quality Music"
 }
 
-ValueDefaults {
-       PlaybackChannels 2
-       CaptureChannels 2
-}
-
 SectionDefaults [
        cset "name='Headphone Jack Switch' 1"
        cset "name='Speaker Switch' 1"

diff --git a/ucm2/sof-hda-dsp/HDA-Capture-value.conf b/ucm2/sof-hda-dsp/HDA-Capture-value.conf
index 5f3c2a38899dcb6541761f17b429a797e1fba6bd..2f1316ab753f05504e76172a5e14ba1d6aa8dbdb 100644 (file)
--- a/ucm2/sof-hda-dsp/HDA-Capture-value.conf
+++ b/ucm2/sof-hda-dsp/HDA-Capture-value.conf
@@ -2,4 +2,3 @@ CapturePCM "hw:${CardId}"
 CaptureMixerElem "Capture"
 CaptureVolume "Capture Volume"
 CaptureSwitch "Capture Switch"
-CaptureChannels 2

diff --git a/ucm2/sof-hda-dsp/Hdmi.conf b/ucm2/sof-hda-dsp/Hdmi.conf
index 1982c7269ed5b47e74f5d46754f3762aa6c8b412..be6cb39945c5d01b7b42f71d0493d28c8ae63ca9 100644 (file)
--- a/ucm2/sof-hda-dsp/Hdmi.conf
+++ b/ucm2/sof-hda-dsp/Hdmi.conf
@@ -14,7 +14,6 @@ SectionDevice."HDMI1" {
        Value {
                PlaybackPriority 500
                PlaybackPCM "hw:${CardId},3"
-               PlaybackChannels 2
                JackControl "HDMI/DP,pcm=3 Jack"
        }
 }
@@ -33,7 +32,6 @@ SectionDevice."HDMI2" {
        Value {
                PlaybackPriority 600
                PlaybackPCM "hw:${CardId},4"
-               PlaybackChannels 2
                JackControl "HDMI/DP,pcm=4 Jack"
        }
 }
@@ -52,7 +50,6 @@ SectionDevice."HDMI3" {
        Value {
                PlaybackPriority 700
                PlaybackPCM "hw:${CardId},5"
-               PlaybackChannels 2
                JackControl "HDMI/DP,pcm=5 Jack"
        }
 }

diff --git a/ucm2/sof-hda-dsp/HiFi.conf b/ucm2/sof-hda-dsp/HiFi.conf
index 6dfdabe2ff406afeb447a063b159b286ba064053..60a8693419359ef0df9669ed574090b5cf67f8ad 100644 (file)
--- a/ucm2/sof-hda-dsp/HiFi.conf
+++ b/ucm2/sof-hda-dsp/HiFi.conf
@@ -24,7 +24,6 @@ SectionDevice."Headphones1" {
                PlaybackMasterElem "Master"
                PlaybackVolume "Headphone Playback Volume"
                PlaybackSwitch "Headphone Playback Switch"
-               PlaybackChannels 2
                If.jack {
                        Condition {
                                Type ControlExists
@@ -77,7 +76,6 @@ SectionDevice."Speaker" {
                PlaybackMasterElem "Master"
                PlaybackVolume "Speaker Playback Volume"
                PlaybackSwitch "Speaker Playback Switch"
-               PlaybackChannels 2
        }
 }
 
@@ -149,9 +147,6 @@ SectionDevice."Mic" {
                        True {
                                CaptureChannels 4
                        }
-                       False {
-                               CaptureChannels 2
-                       }
                }
                If.vol {
                        Condition {