From 99f82355cd5944682d6dc6d6c1f7dfd305931bf4 Mon Sep 17 00:00:00 2001
From: WeirdTreeThing <bradyn127@protonmail.com>
Date: Wed, 23 Aug 2023 09:00:20 -0400
Subject: [PATCH] all: replace JackDev with the corresponding JackControl line

---
 jsl/sof-cs42l42/HiFi.conf          | 2 +-
 jsl/sof-rt5682/HiFi-Magolor.conf   | 2 +-
 picasso/HD-Audio Generic/HiFi.conf | 8 ++++----
 tgl/sof-rt5682/HiFi.elemi.conf     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jsl/sof-cs42l42/HiFi.conf b/jsl/sof-cs42l42/HiFi.conf
index 72b9573..bd82a24 100644
--- a/jsl/sof-cs42l42/HiFi.conf
+++ b/jsl/sof-cs42l42/HiFi.conf
@@ -60,7 +60,7 @@ SectionDevice."Headset" {
 		CapturePriority 200
 		CapturePCM "hw:${CardId},1"
 		CaptureMixerElem "Headset Mic"
-		JackDev "sof-cs42l42 Headset Jack"
+		JackControl "Headset Mic Jack"
 	}
 	EnableSequence [
 		cset "name='Headset Mic Switch' on"
diff --git a/jsl/sof-rt5682/HiFi-Magolor.conf b/jsl/sof-rt5682/HiFi-Magolor.conf
index f195550..e740a32 100644
--- a/jsl/sof-rt5682/HiFi-Magolor.conf
+++ b/jsl/sof-rt5682/HiFi-Magolor.conf
@@ -69,7 +69,7 @@ SectionDevice."Headset" {
 		CapturePriority 200
 		CapturePCM "hw:${CardId},1"
 		CaptureMixerElem "Headset Mic"
-		JackDev "sof-rt5682 Headset Jack"
+		JackControl "Headset Mic Jack"
 	}
 	EnableSequence [
 		cset "name='Headset Mic Switch' on"
diff --git a/picasso/HD-Audio Generic/HiFi.conf b/picasso/HD-Audio Generic/HiFi.conf
index c573ff6..e18f0f3 100644
--- a/picasso/HD-Audio Generic/HiFi.conf	
+++ b/picasso/HD-Audio Generic/HiFi.conf	
@@ -14,7 +14,7 @@ SectionDevice."HDMI1" {
 
 	Value {
 		PlaybackPCM "hw:${CardId},3"
-		JackDev "HD-Audio Generic HDMI/DP,pcm=3"
+		JackControl "HDMI/DP,pcm=3 Jack"
 	}
 	EnableSequence [
 	]
@@ -27,7 +27,7 @@ SectionDevice."HDMI2" {
 
 	Value {
 		PlaybackPCM "hw:${CardId},7"
-		JackDev "HD-Audio Generic HDMI/DP,pcm=7"
+		JackControl "HDMI/DP,pcm=7 Jack"
 	}
 	EnableSequence [
 	]
@@ -40,7 +40,7 @@ SectionDevice."HDMI3" {
 
 	Value {
 		PlaybackPCM "hw:${CardId},8"
-		JackDev "HD-Audio Generic HDMI/DP,pcm=8"
+		JackControl "HDMI/DP,pcm=8 Jack"
 	}
 	EnableSequence [
 	]
@@ -53,7 +53,7 @@ SectionDevice."HDMI4" {
 
 	Value {
 		PlaybackPCM "hw:${CardId},9"
-		JackDev "HD-Audio Generic HDMI/DP,pcm=9"
+		JackControl "HDMI/DP,pcm=9 Jack"
 	}
 	EnableSequence [
 	]
diff --git a/tgl/sof-rt5682/HiFi.elemi.conf b/tgl/sof-rt5682/HiFi.elemi.conf
index 224b595..2baea44 100644
--- a/tgl/sof-rt5682/HiFi.elemi.conf
+++ b/tgl/sof-rt5682/HiFi.elemi.conf
@@ -79,7 +79,7 @@ SectionDevice."Headset" {
 		CapturePriority 200
 		CapturePCM "hw:${CardId},1"
 		CaptureMixerElem "Headset Mic"
-		JackDev "sof-rt5682 Headset Jack"
+		JackControl "Headset Mic Jack"
 }
 	EnableSequence [
 		cset "name='Headset Mic Switch' on"