File 0015-sof-soundwire-initial-UCM2-version.patch of Package alsa-ucm-conf

Overview Repositories Revisions Requests Users Attributes Meta

File 0015-sof-soundwire-initial-UCM2-version.patch of Package alsa-ucm-conf (Revision f501f9ce0f5aa554a47e3201a0f98fd9)

Currently displaying revision f501f9ce0f5aa554a47e3201a0f98fd9 , Show latest

From 9f2dae6a560c60593c24aa4b85aed07418f9dd8e Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Mon, 16 Mar 2020 16:42:11 -0500
Subject: [PATCH 15/51] sof-soundwire: initial UCM2 version

Add support for sof-soundwire driver, with conditional inclusion of
sections for RT700, RT711, RT5682, RT1308, RT715.

Signed-off-by: Libin Yang <libin.yang@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 ucm2/codecs/rt5682/init.conf          | 24 +++++++++++
 ucm2/codecs/rt700/init.conf           | 17 ++++++++
 ucm2/codecs/rt711/init.conf           | 17 ++++++++
 ucm2/codecs/rt715/init.conf           | 19 +++++++++
 ucm2/sof-soundwire/Hdmi.conf          | 79 +++++++++++++++++++++++++++++++++++
 ucm2/sof-soundwire/HiFi.conf          |  8 ++++
 ucm2/sof-soundwire/RT1308-1.conf      | 23 ++++++++++
 ucm2/sof-soundwire/RT1308-2.conf      | 30 +++++++++++++
 ucm2/sof-soundwire/RT1308.conf        | 30 +++++++++++++
 ucm2/sof-soundwire/RT5682.conf        | 62 +++++++++++++++++++++++++++
 ucm2/sof-soundwire/RT700.conf         | 75 +++++++++++++++++++++++++++++++++
 ucm2/sof-soundwire/RT711.conf         | 51 ++++++++++++++++++++++
 ucm2/sof-soundwire/RT715.conf         | 31 ++++++++++++++
 ucm2/sof-soundwire/sof-soundwire.conf | 11 +++++
 14 files changed, 477 insertions(+)
 create mode 100644 ucm2/codecs/rt5682/init.conf
 create mode 100644 ucm2/codecs/rt700/init.conf
 create mode 100644 ucm2/codecs/rt711/init.conf
 create mode 100644 ucm2/codecs/rt715/init.conf
 create mode 100644 ucm2/sof-soundwire/Hdmi.conf
 create mode 100644 ucm2/sof-soundwire/HiFi.conf
 create mode 100644 ucm2/sof-soundwire/RT1308-1.conf
 create mode 100644 ucm2/sof-soundwire/RT1308-2.conf
 create mode 100644 ucm2/sof-soundwire/RT1308.conf
 create mode 100644 ucm2/sof-soundwire/RT5682.conf
 create mode 100644 ucm2/sof-soundwire/RT700.conf
 create mode 100644 ucm2/sof-soundwire/RT711.conf
 create mode 100644 ucm2/sof-soundwire/RT715.conf
 create mode 100644 ucm2/sof-soundwire/sof-soundwire.conf

diff --git a/ucm2/codecs/rt5682/init.conf b/ucm2/codecs/rt5682/init.conf
new file mode 100644
index 000000000000..d819febf1e06
--- /dev/null
+++ b/ucm2/codecs/rt5682/init.conf
@@ -0,0 +1,24 @@
+# RT5682 specific volume control settings
+If.RT5682init {
+	Condition {
+		Type String
+		Haystack "${CardComponents}"
+		Needle "hs:rt5682"
+	}
+	True {
+		BootSequence [
+			cset "name='rt5682 Stereo1 DAC MIXL DAC L1 Switch' 1"
+			cset "name='rt5682 Stereo1 DAC MIXR DAC R1 Switch' 1"
+			cset "name='rt5682 DAC L Mux' 1"
+			cset "name='rt5682 DAC R Mux' 1"
+			cset "name='rt5682 IF1 01 ADC Swap Mux' 2"
+			cset "name='rt5682 CBJ Boost Volume' 3"
+			cset "name='rt5682 Stereo1 ADC L Mux' 0"
+			cset "name='rt5682 Stereo1 ADC R Mux' 0"
+			cset "name='rt5682 Stereo1 ADC L1 Mux' 1"
+			cset "name='rt5682 Stereo1 ADC R1 Mux' 1"
+			cset "name='rt5682 Stereo1 ADC MIXL ADC2 Switch' 0"
+			cset "name='rt5682 Stereo1 ADC MIXR ADC2 Switch' 0"
+		]
+	}
+}
diff --git a/ucm2/codecs/rt700/init.conf b/ucm2/codecs/rt700/init.conf
new file mode 100644
index 000000000000..c5be34fc6250
--- /dev/null
+++ b/ucm2/codecs/rt700/init.conf
@@ -0,0 +1,17 @@
+# RT700 specific volume control settings
+If.rt700init {
+	Condition {
+		Type String
+		Haystack "${CardComponents}"
+		Needle "hs:rt700"
+	}
+	True {
+		BootSequence [
+			cset "name='DAC Front Playback Volume' 87"
+			cset "name='HPO Mux' 'Front'"
+			cset "name='ADC 09 Capture Volume' 63"
+			cset "name='ADC 22 Mux' 'MIC2'"
+			cset "name='AMIC Volume' 1"
+		]
+	}
+}
diff --git a/ucm2/codecs/rt711/init.conf b/ucm2/codecs/rt711/init.conf
new file mode 100644
index 000000000000..c2b86296fa9e
--- /dev/null
+++ b/ucm2/codecs/rt711/init.conf
@@ -0,0 +1,17 @@
+# RT711 specific volume control settings
+If.rt711init {
+	Condition {
+		Type String
+		Haystack "${CardComponents}"
+		Needle "hs:rt711"
+	}
+	True {
+		BootSequence [
+			cset "name='rt711 DAC Surr Playback Volume' 87"
+			cset "name='rt711 ADC 08 Capture Volume' 63"
+			cset "name='rt711 ADC 23 Mux' 'MIC2'"
+			cset "name='rt711 ADC 08 Capture Switch' 1"
+			cset "name='rt711 AMIC Volume' 1"
+		]
+	}
+}
diff --git a/ucm2/codecs/rt715/init.conf b/ucm2/codecs/rt715/init.conf
new file mode 100644
index 000000000000..745f4712ebc4
--- /dev/null
+++ b/ucm2/codecs/rt715/init.conf
@@ -0,0 +1,19 @@
+# RT715 specific volume control settings
+If.RT715init {
+	Condition {
+		Type String
+		Haystack "${CardComponents}"
+		Needle "mic:rt715"
+	}
+	True {
+		BootSequence [
+			cset "name='rt715 DMIC3 Boost' 2"
+			cset "name='rt715 DMIC4 Boost' 2"
+			cset "name='rt715 ADC 24 Mux' 3"
+			cset "name='rt715 ADC 25 Mux' 4"
+			cset "name='rt715 ADC 27 Capture Switch' 1"
+			cset "name='rt715 ADC 07 Capture Switch' 1"
+
+		]
+	}
+}
diff --git a/ucm2/sof-soundwire/Hdmi.conf b/ucm2/sof-soundwire/Hdmi.conf
new file mode 100644
index 000000000000..d0ba7907e3a3
--- /dev/null
+++ b/ucm2/sof-soundwire/Hdmi.conf
@@ -0,0 +1,79 @@
+# Use case Configuration for sof-soundwire card
+
+If.hdmi1 {
+	Condition {
+		Type ControlExists
+		Control "iface=CARD,name='HDMI/DP,pcm=5 Jack'"
+	}
+	True {
+		SectionDevice."HDMI1" {
+			Comment "HDMI1/DP1 Output"
+
+			EnableSequence [
+				cset "name='IEC958 Playback Switch' on"
+			]
+
+			DisableSequence [
+				cset "name='IEC958 Playback Switch' off"
+			]
+
+			Value {
+				PlaybackPriority 500
+				PlaybackPCM "hw:${CardId},5"
+				JackControl "HDMI/DP,pcm=5 Jack"
+			}
+		}
+	}
+}
+
+If.hdmi2 {
+	Condition {
+		Type ControlExists
+		Control "iface=CARD,name='HDMI/DP,pcm=6 Jack'"
+	}
+	True {
+		SectionDevice."HDMI2" {
+			Comment "HDMI2/DP2 Output"
+
+			EnableSequence [
+				cset "name='IEC958 Playback Switch',index=1 on"
+			]
+
+			DisableSequence [
+				cset "name='IEC958 Playback Switch',index=1 off"
+			]
+
+			Value {
+				PlaybackPriority 600
+				PlaybackPCM "hw:${CardId},6"
+				JackControl "HDMI/DP,pcm=6 Jack"
+			}
+		}
+	}
+}
+
+If.hdmi3 {
+	Condition {
+		Type ControlExists
+		Control "iface=CARD,name='HDMI/DP,pcm=7 Jack'"
+	}
+	True {
+		SectionDevice."HDMI3" {
+			Comment "HDMI3/DP3 Output"
+
+			EnableSequence [
+				cset "name='IEC958 Playback Switch',index=2 on"
+			]
+
+			DisableSequence [
+				cset "name='IEC958 Playback Switch',index=2 off"
+			]
+
+			Value {
+				PlaybackPriority 700
+				PlaybackPCM "hw:${CardId},7"
+				JackControl "HDMI/DP,pcm=7 Jack"
+			}
+		}
+	}
+}
diff --git a/ucm2/sof-soundwire/HiFi.conf b/ucm2/sof-soundwire/HiFi.conf
new file mode 100644
index 000000000000..457cf6748346
--- /dev/null
+++ b/ucm2/sof-soundwire/HiFi.conf
@@ -0,0 +1,8 @@
+# Use case Configuration for sof-soundwire card
+
+<sof-soundwire/RT700.conf>
+<sof-soundwire/RT711.conf>
+<sof-soundwire/RT5682.conf>
+<sof-soundwire/RT1308.conf>
+<sof-soundwire/RT715.conf>
+<sof-soundwire/Hdmi.conf>
diff --git a/ucm2/sof-soundwire/RT1308-1.conf b/ucm2/sof-soundwire/RT1308-1.conf
new file mode 100644
index 000000000000..da2eeaee0294
--- /dev/null
+++ b/ucm2/sof-soundwire/RT1308-1.conf
@@ -0,0 +1,23 @@
+# Use case Configuration for sof-soundwire card
+
+SectionDevice."Speaker" {
+	Comment	"Speaker"
+
+	EnableSequence [
+		cset "name='rt1308-1 DAC L Switch' 1"
+		cset "name='rt1308-1 DAC R Switch' 1"
+		cset "name='Speaker Switch' on"
+	]
+
+	DisableSequence [
+		cset "name='rt1308-1 DAC L Switch' 0"
+		cset "name='rt1308-1 DAC R Switch' 0"
+		cset "name='Speaker Switch' off"
+	]
+
+	Value {
+	      PlaybackPriority 100
+	      PlaybackPCM "hw:${CardId},2"
+	      PlaybackChannels "2"
+	}
+}
diff --git a/ucm2/sof-soundwire/RT1308-2.conf b/ucm2/sof-soundwire/RT1308-2.conf
new file mode 100644
index 000000000000..3484b7038b82
--- /dev/null
+++ b/ucm2/sof-soundwire/RT1308-2.conf
@@ -0,0 +1,30 @@
+# Use case Configuration for sof-soundwire card
+
+SectionDevice."Speaker" {
+	Comment	"Speaker"
+
+	EnableSequence [
+		cset "name='rt1308-1 RX Channel Select' LL"
+		cset "name='rt1308-2 RX Channel Select' RR"
+
+		cset "name='rt1308-1 DAC L Switch' 1"
+		cset "name='rt1308-1 DAC R Switch' 1"
+		cset "name='rt1308-2 DAC L Switch' 1"
+		cset "name='rt1308-2 DAC R Switch' 1"
+		cset "name='Speaker Switch' on"
+	]
+
+	DisableSequence [
+		cset "name='rt1308-1 DAC L Switch' 0"
+		cset "name='rt1308-1 DAC R Switch' 0"
+		cset "name='rt1308-2 DAC L Switch' 0"
+		cset "name='rt1308-2 DAC R Switch' 0"
+		cset "name='Speaker Switch' off"
+	]
+
+	Value {
+	      PlaybackPriority 100
+	      PlaybackPCM "hw:${CardId},2"
+	      PlaybackChannels "2"
+	}
+}
diff --git a/ucm2/sof-soundwire/RT1308.conf b/ucm2/sof-soundwire/RT1308.conf
new file mode 100644
index 000000000000..f8e36a3e20a4
--- /dev/null
+++ b/ucm2/sof-soundwire/RT1308.conf
@@ -0,0 +1,30 @@
+# Use case Configuration for sof-soundwire card
+# alsaucm -c sof-soundwire  set _verb HiFi set _enadev Speaker
+
+If.RT1308 {
+	Condition {
+		Type String
+		Haystack "${CardComponents}"
+		Needle "spk:rt1308"
+	}
+	True {
+
+		If.2ch {
+			Condition {
+				Type String
+				Haystack "${CardComponents}"
+				Needle "cfg-spk:2"
+			}
+			True {
+
+<sof-soundwire/RT1308-1.conf>
+
+			}
+			False {
+
+<sof-soundwire/RT1308-2.conf>
+
+			}
+		}
+	}
+}
diff --git a/ucm2/sof-soundwire/RT5682.conf b/ucm2/sof-soundwire/RT5682.conf
new file mode 100644
index 000000000000..2a63bf2f610a
--- /dev/null
+++ b/ucm2/sof-soundwire/RT5682.conf
@@ -0,0 +1,62 @@
+# Use case Configuration for sof-soundwire card
+
+If.RT5682 {
+	Condition {
+		Type String
+		Haystack "${CardComponents}"
+        	Needle "hs:rt5682" 
+	}
+	True {
+
+		SectionDevice."Headphones" {
+			Comment	"Headphones"
+
+			EnableSequence [
+				cset "name='Headphone Switch' on"
+				cset "name='rt5682 HPOL Playback Switch' 1"
+				cset "name='rt5682 HPOR Playback Switch' 1"
+			]
+
+			DisableSequence [
+				cset "name='rt5682 HPOL Playback Switch' 0"
+				cset "name='rt5682 HPOR Playback Switch' 0"
+				cset "name='Headphone Switch' off"
+
+			]
+
+			Value {
+			      PlaybackPriority 200
+			      PlaybackPCM "hw:${CardId},0"
+			      PlaybackChannels "2"
+			      JackControl "Headphone Jack"
+			}
+		}
+
+		SectionDevice."Headset" {
+			Comment "Headset Microphone"
+
+			EnableSequence [
+				cset "name='Headset Mic Switch' on"
+				cset "name='rt5682 STO1 ADC Capture Switch' 1"
+				cset "name='rt5682 RECMIX1L CBJ Switch' 1"
+				cset "name='rt5682 Stereo1 ADC MIXL ADC1 Switch' 1"
+				cset "name='rt5682 Stereo1 ADC MIXR ADC1 Switch' 1"
+			]
+
+			DisableSequence [
+				cset "name='rt5682 STO1 ADC Capture Switch' 0"
+				cset "name='rt5682 RECMIX1L CBJ Switch' 0"
+				cset "name='rt5682 Stereo1 ADC MIXL ADC1 Switch' 0"
+				cset "name='rt5682 Stereo1 ADC MIXR ADC1 Switch' 0"
+				cset "name='Headset Mic Switch' off"
+			]
+
+			Value {
+				CapturePriority 200
+			     	CapturePCM "hw:${CardId},1"
+			      	CaptureChannels "2"
+			      	JackControl "Headset Mic Jack"
+			}
+		}
+	}
+}
diff --git a/ucm2/sof-soundwire/RT700.conf b/ucm2/sof-soundwire/RT700.conf
new file mode 100644
index 000000000000..9fe532c3c528
--- /dev/null
+++ b/ucm2/sof-soundwire/RT700.conf
@@ -0,0 +1,75 @@
+# Use case Configuration for sof-soundwire card
+
+If.RT700 {
+	Condition {
+		Type String
+		Haystack "${CardComponents}"
+        	Needle "hs:rt700" 
+	}
+	True {
+
+		SectionDevice."Headphones" {
+			Comment	"Headphones"
+
+			ConflictingDevice [
+				"Speaker"
+			]
+
+			EnableSequence [
+				cset "name='Headphones Switch' on"
+			]
+
+			DisableSequence [
+				cset "name='Headphones Switch' off"
+			]
+
+			Value {
+			      PlaybackPriority 200
+			      PlaybackPCM "hw:${CardId},0"
+			      PlaybackChannels "2"
+			      JackControl "Headphone Jack"
+			}
+		}
+
+		SectionDevice."Speaker" {
+			Comment	"Speaker"
+			
+			ConflictingDevice [
+				"Headphones"
+			]
+
+			EnableSequence [
+				cset "name='Speaker Switch' on"
+			]
+
+			DisableSequence [
+				cset "name='Speaker Switch' off"
+			]
+
+			Value {
+			      PlaybackPriority 100
+			      PlaybackPCM "hw:${CardId},0"
+			      PlaybackChannels "2"
+			}
+		}
+
+		SectionDevice."Headset" {
+			Comment "Headset Microphone"
+
+			EnableSequence [
+				cset "name='ADC 09 Capture Switch' 1"
+			]
+
+			DisableSequence [
+				cset "name='ADC 09 Capture Switch' 0"
+			]
+
+			Value {
+				CapturePriority 200
+			     	CapturePCM "hw:${CardId},1"
+			      	CaptureChannels "2"
+			      	JackControl "Headset Mic Jack"
+			}
+		}
+	}
+}
diff --git a/ucm2/sof-soundwire/RT711.conf b/ucm2/sof-soundwire/RT711.conf
new file mode 100644
index 000000000000..11a504ab6916
--- /dev/null
+++ b/ucm2/sof-soundwire/RT711.conf
@@ -0,0 +1,51 @@
+# Use case Configuration for sof-soundwire card
+
+If.RT711 {
+	Condition {
+		Type String
+		Haystack "${CardComponents}"
+        	Needle "hs:rt711" 
+	}
+	True {
+
+		SectionDevice."Headphones" {
+			Comment	"Headphones"
+
+			EnableSequence [
+				cset "name='Headphone Switch' on"
+			]
+
+			DisableSequence [
+				cset "name='Headphone Switch' off"
+			]
+
+			Value {
+			      PlaybackPriority 200
+			      PlaybackPCM "hw:${CardId},0"
+			      PlaybackChannels "2"
+			      JackControl "Headphone Jack"
+			}
+		}
+
+		SectionDevice."Headset" {
+			Comment "Headset Microphone"
+
+			EnableSequence [
+				cset "name='PGA2.0 2 Master Capture Switch' 1"
+			]
+
+			DisableSequence [
+				cset "name='PGA2.0 2 Master Capture Switch' 0"
+			]
+
+			Value {
+				CapturePriority 200
+			     	CapturePCM "hw:${CardId},1"
+			      	CaptureChannels "2"
+			      	JackControl "Headset Mic Jack"
+				CaptureSwitch "PGA2.0 2 Master Capture Switch"
+				CaptureVolume "PGA2.0 2 Master Capture Volume"
+			}
+		}
+	}
+}
diff --git a/ucm2/sof-soundwire/RT715.conf b/ucm2/sof-soundwire/RT715.conf
new file mode 100644
index 000000000000..2b8d89d3e0b5
--- /dev/null
+++ b/ucm2/sof-soundwire/RT715.conf
@@ -0,0 +1,31 @@
+# Use case Configuration for sof-soundwire card
+
+If.RT715 {
+	Condition {
+		Type String
+		Haystack "${CardComponents}"
+        	Needle "mic:rt715"
+	}
+	True {
+
+		SectionDevice."Mic" {
+			Comment	"SoundWire microphones"
+
+			EnableSequence [
+				cset "name='PGA5.0 5 Master Capture Switch' 1"
+			]
+
+			DisableSequence [
+				cset "name='PGA5.0 5 Master Capture Switch' 0"
+			]
+
+			Value {
+			      CapturePriority 100
+			      CapturePCM "hw:${CardId},4"
+			      CaptureChannels "2"
+			      CaptureSwitch "PGA5.0 5 Master Capture Switch"
+			      CaptureVolume "PGA5.0 5 Master Capture Volume"
+			}
+		}
+	}
+}
diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf
new file mode 100644
index 000000000000..565f2b5092da
--- /dev/null
+++ b/ucm2/sof-soundwire/sof-soundwire.conf
@@ -0,0 +1,11 @@
+Syntax 2
+
+SectionUseCase."HiFi" {
+	File "HiFi.conf"
+	Comment "Play HiFi quality Music"
+}
+
+<codecs/rt5682/init.conf>
+<codecs/rt700/init.conf>
+<codecs/rt711/init.conf>
+<codecs/rt715/init.conf>
-- 
2.16.4

Places

File 0015-sof-soundwire-initial-UCM2-version.patch of Package alsa-ucm-conf (Revision f501f9ce0f5aa554a47e3201a0f98fd9)

Places