From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 29 Nov 2019 15:24:44 +0000 (+0100)
Subject: ucm2: change 'Headphone' to 'Headphones'
X-Git-Tag: v1.2.1.2~1
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=d2b1aaade3f889881a5957de89390234dcd4d682;p=alsa-ucm-conf.git

ucm2: change 'Headphone' to 'Headphones'

It is more correct name and it is listed in use-case.h.

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

diff --git a/ucm2/DAISY-I2S/HiFi.conf b/ucm2/DAISY-I2S/HiFi.conf
index fefa56e..02292f2 100644
--- a/ucm2/DAISY-I2S/HiFi.conf
+++ b/ucm2/DAISY-I2S/HiFi.conf
@@ -14,7 +14,7 @@ SectionVerb {
 	]
 }
 
-SectionDevice."Headphone" {
+SectionDevice."Headphones" {
 	EnableSequence [
 		cset "name='EQ1 Switch' off"
 		cset "name='Left Headphone Mixer Left DAC1 Switch' on"
diff --git a/ucm2/DB820c/HiFi.conf b/ucm2/DB820c/HiFi.conf
index 39911d9..fa7770e 100644
--- a/ucm2/DB820c/HiFi.conf
+++ b/ucm2/DB820c/HiFi.conf
@@ -35,8 +35,8 @@ SectionVerb {
 	]
 }
 
-SectionDevice."Headphone" {
-	Comment "Headphone playback"
+SectionDevice."Headphones" {
+	Comment "Headphones playback"
 
 	EnableSequence [
 		cset "name='SLIM RX0 MUX' ZERO"
diff --git a/ucm2/Dell-WD15-Dock/HiFi.conf b/ucm2/Dell-WD15-Dock/HiFi.conf
index ab9e14c..3b02f81 100644
--- a/ucm2/Dell-WD15-Dock/HiFi.conf
+++ b/ucm2/Dell-WD15-Dock/HiFi.conf
@@ -1,5 +1,5 @@
-SectionDevice."Headphone" {
-	Comment "Headphone"
+SectionDevice."Headphones" {
+	Comment "Headphones"
 
 	Value {
 		PlaybackChannels "2"
diff --git a/ucm2/GoogleNyan/HiFi.conf b/ucm2/GoogleNyan/HiFi.conf
index f5a74cb..1f7e93c 100644
--- a/ucm2/GoogleNyan/HiFi.conf
+++ b/ucm2/GoogleNyan/HiFi.conf
@@ -37,7 +37,7 @@ SectionVerb {
 	]
 }
 
-SectionDevice."Headphone" {
+SectionDevice."Headphones" {
 	EnableSequence [
 		cset "name='Speakers Switch' off"
 		cset "name='Headphones Switch' on"
diff --git a/ucm2/HDA Intel PCH/HiFi-dual.conf b/ucm2/HDA Intel PCH/HiFi-dual.conf
index 47c1583..63b3fe6 100644
--- a/ucm2/HDA Intel PCH/HiFi-dual.conf	
+++ b/ucm2/HDA Intel PCH/HiFi-dual.conf	
@@ -52,8 +52,8 @@ SectionDevice."LineOut" {
 	}
 }
 
-SectionDevice."Headphone" {
-	Comment "Headphone"
+SectionDevice."Headphones" {
+	Comment "Headphones"
 
 	Value {
 		PlaybackChannels "2"
diff --git a/ucm2/VEYRON-I2S/HiFi.conf b/ucm2/VEYRON-I2S/HiFi.conf
index a238c6a..8d07c73 100644
--- a/ucm2/VEYRON-I2S/HiFi.conf
+++ b/ucm2/VEYRON-I2S/HiFi.conf
@@ -41,7 +41,7 @@ SectionVerb {
 	]
 }
 
-SectionDevice."Speaker".0 {
+SectionDevice."Speaker" {
 	Comment "Speaker"
 
 	Value {
@@ -55,7 +55,7 @@ SectionDevice."Speaker".0 {
 	]
 }
 
-SectionDevice."Internal Mic".0 {
+SectionDevice."Internal Mic" {
 	Comment "Int Mic"
 
 	Value {
@@ -69,8 +69,8 @@ SectionDevice."Internal Mic".0 {
 	]
 }
 
-SectionDevice."Headphone".0 {
-	Comment "Headphone"
+SectionDevice."Headphones" {
+	Comment "Headphones"
 
 	Value {
 		PlaybackPCM "hw:${CardId},0"
@@ -88,7 +88,7 @@ SectionDevice."Headphone".0 {
 	]
 }
 
-SectionDevice."Mic".0 {
+SectionDevice."Mic" {
 	Comment "Headset Mic"
 
 	Value {
diff --git a/ucm2/sof-hda-dsp/HiFi.conf b/ucm2/sof-hda-dsp/HiFi.conf
index 392dff8..f1c81a1 100644
--- a/ucm2/sof-hda-dsp/HiFi.conf
+++ b/ucm2/sof-hda-dsp/HiFi.conf
@@ -6,8 +6,8 @@ SectionVerb {
 	]
 }
 
-SectionDevice."Headphone" {
-	Comment "Headphone"
+SectionDevice."Headphones" {
+	Comment "Headphones"
 
 	EnableSequence [
 		cset "name='Headphone Playback Switch' on"
@@ -88,8 +88,8 @@ If.monomic {
 		ControlEnum "Headphone Mic"
 	}
 	True {
-		SectionDevice."HeadphoneMic" {
-			Comment "Headphone Stereo Microphone"
+		SectionDevice."HeadphonesMic" {
+			Comment "Headphones Stereo Microphone"
 
 			ConflictingDevice [
 				"HeadsetMic"
@@ -121,8 +121,8 @@ If.monomic {
 		}
 	}
 	False {
-		SectionDevice."HeadphoneMic" {
-			Comment "Headphone Stereo Microphone"
+		SectionDevice."HeadphonesMic" {
+			Comment "Headphones Stereo Microphone"
 
 			Value {
 				CapturePriority 200