From 0910aa744e258de6889b2023611fcfa2b630b14e Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 23 Aug 2021 15:49:31 +0200
Subject: [PATCH] Librem 5 Devkit: modernize config

- remove extra default values
- remove explicit zeros
- add PlaybackMixerElem

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 ucm2/NXP/iMX8/Librem_5_Devkit/HiFi.conf          | 16 ++++++++--------
 .../iMX8/Librem_5_Devkit/Librem 5 Devkit.conf    |  5 -----
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/ucm2/NXP/iMX8/Librem_5_Devkit/HiFi.conf b/ucm2/NXP/iMX8/Librem_5_Devkit/HiFi.conf
index f34aa92..9ead6a0 100644
--- a/ucm2/NXP/iMX8/Librem_5_Devkit/HiFi.conf
+++ b/ucm2/NXP/iMX8/Librem_5_Devkit/HiFi.conf
@@ -15,11 +15,9 @@ SectionVerb {
 	DisableSequence [
 		cset "name='PCM Playback Volume' 0"
 	]
-	Value {
-	}
 }
 
-SectionDevice."Handset".0 {
+SectionDevice."Handset" {
 	Comment "Handset"
 
 	ConflictingDevice [
@@ -38,15 +36,16 @@ SectionDevice."Handset".0 {
 	]
 	Value {
 		PlaybackPriority "1000"
-		PlaybackPCM "hw:${CardId},0"
+		PlaybackPCM "hw:${CardId}"
 		PlaybackVolume "name='Lineout Playback Volume'"
 		PlaybackSwitch "name='Lineout Playback Switch'"
+		PlaybackMixerElem "Lineout"
 		CapturePriority "1000"
-		CapturePCM "hw:${CardId},0"
+		CapturePCM "hw:${CardId}"
 	}
 }
 
-SectionDevice."Headset".0 {
+SectionDevice."Headset" {
 	Comment "Headset"
 
 	ConflictingDevice [
@@ -64,11 +63,12 @@ SectionDevice."Headset".0 {
 	]
 	Value {
 		PlaybackPriority "700"
-		PlaybackPCM "hw:${CardId},0"
+		PlaybackPCM "hw:${CardId}"
 		PlaybackVolume "name='Headphone Playback Volume'"
 		PlaybackSwitch "name='Headphone Playback Switch'"
+		PlaybackMixerElem "Headphone"
 		CapturePriority "700"
-		CapturePCM "hw:${CardId},0"
+		CapturePCM "hw:${CardId}"
 		JackControl "Headphones Jack"
 	}
 }
diff --git a/ucm2/NXP/iMX8/Librem_5_Devkit/Librem 5 Devkit.conf b/ucm2/NXP/iMX8/Librem_5_Devkit/Librem 5 Devkit.conf
index 933e3d4..9153d3d 100644
--- a/ucm2/NXP/iMX8/Librem_5_Devkit/Librem 5 Devkit.conf	
+++ b/ucm2/NXP/iMX8/Librem_5_Devkit/Librem 5 Devkit.conf	
@@ -3,8 +3,3 @@ Syntax 2
 SectionUseCase."HiFi" {
 	File "HiFi.conf"
 }
-
-ValueDefaults {
-	PlaybackPCM "hw:${CardId},0"
-	CapturePCM "hw:${CardId},0"
-}
-- 
2.47.1