From e83c880524d21fdc1cc042a8fa6908f88dab0d53 Mon Sep 17 00:00:00 2001
From: Tasos Sahanidis <tasos@tasossah.com>
Date: Thu, 27 Nov 2025 06:03:28 +0200
Subject: [PATCH] USB-Audio: Add jack controls for HP Thunderbolt Dock G2

Similar to the Dell WD15/WD19, this allows for jack detection
(headphones/headset) on the HP Thunderbolt Dock G2.

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/650
Link: https://lore.kernel.org/linux-sound/20251126003805.2705503-1-tasos@tasossah.com/T/
Signed-off-by: Tasos Sahanidis <tasos@tasossah.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 .../Thunderbolt-Dock-Audio-Headset-HiFi.conf  | 43 +++++++++++++++++++
 .../HP/Thunderbolt-Dock-Audio-Headset.conf    |  6 +++
 ucm2/USB-Audio/USB-Audio.conf                 |  9 ++++
 3 files changed, 58 insertions(+)
 create mode 100644 ucm2/USB-Audio/HP/Thunderbolt-Dock-Audio-Headset-HiFi.conf
 create mode 100644 ucm2/USB-Audio/HP/Thunderbolt-Dock-Audio-Headset.conf

diff --git a/ucm2/USB-Audio/HP/Thunderbolt-Dock-Audio-Headset-HiFi.conf b/ucm2/USB-Audio/HP/Thunderbolt-Dock-Audio-Headset-HiFi.conf
new file mode 100644
index 0000000..6a66e99
--- /dev/null
+++ b/ucm2/USB-Audio/HP/Thunderbolt-Dock-Audio-Headset-HiFi.conf
@@ -0,0 +1,43 @@
+SectionDevice."Headphones" {
+	Comment "Headphones"
+
+	Value {
+		PlaybackPriority 100
+		PlaybackPCM "hw:${CardId}"
+		JackControl "Headsets Playback Jack"
+
+		If.Headphone_ctl {
+			Condition {
+				Type ControlExists
+				Control "name='Headsets Playback Switch'"
+			}
+			True {
+				PlaybackMixerElem "Headsets"
+				PlaybackVolume "Headsets Playback Volume"
+				PlaybackSwitch "Headsets Playback Switch"
+			}
+		}
+	}
+}
+
+SectionDevice."Headset" {
+	Comment "Headset Microphone"
+
+	Value {
+		CapturePriority 100
+		CapturePCM "hw:${CardId}"
+		JackControl "Headset Capture Jack"
+
+		If.Mic_ctl {
+			Condition {
+				Type ControlExists
+				Control "name='Headset Capture Switch'"
+			}
+			True {
+				CaptureMixerElem "Headset"
+				CaptureVolume "Headset Capture Volume"
+				CaptureSwitch "Headset Capture Switch"
+			}
+		}
+	}
+}
diff --git a/ucm2/USB-Audio/HP/Thunderbolt-Dock-Audio-Headset.conf b/ucm2/USB-Audio/HP/Thunderbolt-Dock-Audio-Headset.conf
new file mode 100644
index 0000000..154c079
--- /dev/null
+++ b/ucm2/USB-Audio/HP/Thunderbolt-Dock-Audio-Headset.conf
@@ -0,0 +1,6 @@
+Comment "HP Thunderbolt Dock G2 headset"
+
+SectionUseCase."HiFi" {
+	Comment "Default"
+	File "/USB-Audio/HP/Thunderbolt-Dock-Audio-Headset-HiFi.conf"
+}
diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
index b15f6e2..3722310 100644
--- a/ucm2/USB-Audio/USB-Audio.conf
+++ b/ucm2/USB-Audio/USB-Audio.conf
@@ -113,6 +113,15 @@ If.hp_only {
 	}
 }
 
+If.hp-tb-dock {
+	Condition {
+		Type RegexMatch
+		String "${CardComponents}"
+		Regex "USB03f0:0269"
+	}
+	True.Define.ProfileName "HP/Thunderbolt-Dock-Audio-Headset"
+}
+
 If.hyperx-solocast {
 	Condition {
 		Type String
-- 
2.47.3