From 8f90c6ae514fa5449d0f2b514c959eb212c4b8cd Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 11 Nov 2019 12:45:17 +0100
Subject: [PATCH] skylake-rt286: adapt to ucm2

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 {ucm => ucm2}/skylake-rt286/Hdmi1.conf        | 24 +++++++++++--------
 {ucm => ucm2}/skylake-rt286/Hdmi2.conf        | 22 ++++++++++-------
 {ucm => ucm2}/skylake-rt286/HiFi.conf         |  0
 .../skylake-rt286/skylake-rt286.conf          |  3 ++-
 4 files changed, 29 insertions(+), 20 deletions(-)
 rename {ucm => ucm2}/skylake-rt286/Hdmi1.conf (52%)
 rename {ucm => ucm2}/skylake-rt286/Hdmi2.conf (50%)
 rename {ucm => ucm2}/skylake-rt286/HiFi.conf (100%)
 rename {ucm => ucm2}/skylake-rt286/skylake-rt286.conf (98%)

diff --git a/ucm/skylake-rt286/Hdmi1.conf b/ucm2/skylake-rt286/Hdmi1.conf
similarity index 52%
rename from ucm/skylake-rt286/Hdmi1.conf
rename to ucm2/skylake-rt286/Hdmi1.conf
index 0e00fc8..975fd39 100644
--- a/ucm/skylake-rt286/Hdmi1.conf
+++ b/ucm2/skylake-rt286/Hdmi1.conf
@@ -4,17 +4,21 @@
 SectionDevice."Hdmi1" {
         Comment "HDMI/Display Port 1 Stereo"
 
-        EnableSequence [
-        ]
-
-        DisableSequence [
-        ]
-
         Value {
-                PlaybackPCM "hw:skylakert286,4"
+                PlaybackPCM "hw:${CardId},4"
                 PlaybackChannels "2"
                 PlaybackPriority "3"
-                JackControl "HDMI/DP, pcm=4 Jack"
-        }
+		If.1 {
+			Condition {
+				ControlExists
+				Control "iface=CARD,name='HDMI/DP,pcm=4 Jack'"
+			}
+			True {
+				JackControl "HDMI/DP,pcm=4 Jack"
+			}
+			False {
+				JackControl "HDMI/DP, pcm=4 Jack"
+			}
+		}
+	}
 }
-
diff --git a/ucm/skylake-rt286/Hdmi2.conf b/ucm2/skylake-rt286/Hdmi2.conf
similarity index 50%
rename from ucm/skylake-rt286/Hdmi2.conf
rename to ucm2/skylake-rt286/Hdmi2.conf
index 89b31aa..d6ca62f 100644
--- a/ucm/skylake-rt286/Hdmi2.conf
+++ b/ucm2/skylake-rt286/Hdmi2.conf
@@ -4,17 +4,21 @@
 SectionDevice."Hdmi2" {
         Comment "HDMI/Display Port 2 Stereo"
 
-        EnableSequence [
-        ]
-
-        DisableSequence [
-        ]
-
         Value {
-                PlaybackPCM "hw:skylakert286,5"
+                PlaybackPCM "hw:${CardId},5"
                 PlaybackChannels "2"
                 PlaybackPriority "4"
-                JackControl "HDMI/DP, pcm=5 Jack"
+		If.1 {
+			Condition {
+				ControlExists
+				Control "iface=CARD,name='HDMI/DP,pcm=5 Jack'"
+			}
+		 	True {
+		                JackControl "HDMI/DP,pcm=5 Jack"
+			}
+			False {
+		                JackControl "HDMI/DP, pcm=5 Jack"
+			}
+		}
         }
 }
-
diff --git a/ucm/skylake-rt286/HiFi.conf b/ucm2/skylake-rt286/HiFi.conf
similarity index 100%
rename from ucm/skylake-rt286/HiFi.conf
rename to ucm2/skylake-rt286/HiFi.conf
diff --git a/ucm/skylake-rt286/skylake-rt286.conf b/ucm2/skylake-rt286/skylake-rt286.conf
similarity index 98%
rename from ucm/skylake-rt286/skylake-rt286.conf
rename to ucm2/skylake-rt286/skylake-rt286.conf
index f4b156d..f07defb 100644
--- a/ucm/skylake-rt286/skylake-rt286.conf
+++ b/ucm2/skylake-rt286/skylake-rt286.conf
@@ -1,6 +1,8 @@
 # UCM for Intel SKYLAKE/KABYLAKE platforms
 # For Audio in I2S mode
 
+Syntax 2
+
 SectionUseCase."HiFi" {
 	File "HiFi.conf"
 	Comment "Play and record HiFi quality Music"
@@ -24,7 +26,6 @@ ValueDefaults {
 }
 
 SectionDefaults [
-	cdev "hw:skylakert286"
 	cset "name='Headphone Jack Switch' 1"
 	cset "name='Speaker Switch' 1"
 	cset "name='Speaker Playback Switch' 0,0"
-- 
2.47.3