sof-soundwire: cleanups recommended by the ucm-validator

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

diff --git a/ucm2/sof-soundwire/RT1308-1.conf b/ucm2/sof-soundwire/RT1308-1.conf
index da2eeaee02940cda048a2dd1fc74bb2d44046fc7..6da5b7e30a5feedaef769a01a0cab43921f342c6 100644 (file)
--- a/ucm2/sof-soundwire/RT1308-1.conf
+++ b/ucm2/sof-soundwire/RT1308-1.conf
@@ -18,6 +18,5 @@ SectionDevice."Speaker" {
        Value {
              PlaybackPriority 100
              PlaybackPCM "hw:${CardId},2"
-             PlaybackChannels "2"
        }
 }

diff --git a/ucm2/sof-soundwire/RT1308-2.conf b/ucm2/sof-soundwire/RT1308-2.conf
index 3484b7038b82a54e769e88a092b693d9804d6550..f88cb819d6a36265ddc3436d80ac78c7b059af55 100644 (file)
--- a/ucm2/sof-soundwire/RT1308-2.conf
+++ b/ucm2/sof-soundwire/RT1308-2.conf
@@ -25,6 +25,5 @@ SectionDevice."Speaker" {
        Value {
              PlaybackPriority 100
              PlaybackPCM "hw:${CardId},2"
-             PlaybackChannels "2"
        }
 }

diff --git a/ucm2/sof-soundwire/RT5682.conf b/ucm2/sof-soundwire/RT5682.conf
index 2a63bf2f610ac0497f9fa0012b101e93aa4bb76f..95a251dbe4fa5019dc189c5e482c9a08a924c484 100644 (file)
--- a/ucm2/sof-soundwire/RT5682.conf
+++ b/ucm2/sof-soundwire/RT5682.conf
@@ -26,8 +26,7 @@ If.RT5682 {
 
                        Value {
                              PlaybackPriority 200
-                             PlaybackPCM "hw:${CardId},0"
-                             PlaybackChannels "2"
+                             PlaybackPCM "hw:${CardId}"
                              JackControl "Headphone Jack"
                        }
                }
@@ -54,7 +53,6 @@ If.RT5682 {
                        Value {
                                CapturePriority 200
                                CapturePCM "hw:${CardId},1"
-                               CaptureChannels "2"
                                JackControl "Headset Mic Jack"
                        }
                }

diff --git a/ucm2/sof-soundwire/RT700.conf b/ucm2/sof-soundwire/RT700.conf
index 9fe532c3c528274268a3b694400a7347584214c2..d2df46377710c97cc44b5a4f74214ace5465fcd3 100644 (file)
--- a/ucm2/sof-soundwire/RT700.conf
+++ b/ucm2/sof-soundwire/RT700.conf
@@ -25,8 +25,7 @@ If.RT700 {
 
                        Value {
                              PlaybackPriority 200
-                             PlaybackPCM "hw:${CardId},0"
-                             PlaybackChannels "2"
+                             PlaybackPCM "hw:${CardId}"
                              JackControl "Headphone Jack"
                        }
                }
@@ -48,8 +47,7 @@ If.RT700 {
 
                        Value {
                              PlaybackPriority 100
-                             PlaybackPCM "hw:${CardId},0"
-                             PlaybackChannels "2"
+                             PlaybackPCM "hw:${CardId}"
                        }
                }
 
@@ -67,7 +65,6 @@ If.RT700 {
                        Value {
                                CapturePriority 200
                                CapturePCM "hw:${CardId},1"
-                               CaptureChannels "2"
                                JackControl "Headset Mic Jack"
                        }
                }

diff --git a/ucm2/sof-soundwire/RT711.conf b/ucm2/sof-soundwire/RT711.conf
index 11a504ab69164e6fc010b4b1c972926e54801e5d..12b48ed4b4a8882c82f84cce9d5f23e23f889a81 100644 (file)
--- a/ucm2/sof-soundwire/RT711.conf
+++ b/ucm2/sof-soundwire/RT711.conf
@@ -21,8 +21,7 @@ If.RT711 {
 
                        Value {
                              PlaybackPriority 200
-                             PlaybackPCM "hw:${CardId},0"
-                             PlaybackChannels "2"
+                             PlaybackPCM "hw:${CardId}"
                              JackControl "Headphone Jack"
                        }
                }
@@ -41,7 +40,6 @@ If.RT711 {
                        Value {
                                CapturePriority 200
                                CapturePCM "hw:${CardId},1"
-                               CaptureChannels "2"
                                JackControl "Headset Mic Jack"
                                CaptureSwitch "PGA2.0 2 Master Capture Switch"
                                CaptureVolume "PGA2.0 2 Master Capture Volume"

diff --git a/ucm2/sof-soundwire/RT715.conf b/ucm2/sof-soundwire/RT715.conf
index 2b8d89d3e0b5a675b3e42de2ff45269b4c3ae8a4..d1734adc4fb547cbe32ccf6c63c94f8807054e7d 100644 (file)
--- a/ucm2/sof-soundwire/RT715.conf
+++ b/ucm2/sof-soundwire/RT715.conf
@@ -22,7 +22,6 @@ If.RT715 {
                        Value {
                              CapturePriority 100
                              CapturePCM "hw:${CardId},4"
-                             CaptureChannels "2"
                              CaptureSwitch "PGA5.0 5 Master Capture Switch"
                              CaptureVolume "PGA5.0 5 Master Capture Volume"
                        }