File 0022-DB820c-DB845c-move-to-Qualcomm-tree.patch of Package alsa-ucm-conf

Overview Repositories Revisions Requests Users Attributes Meta

File 0022-DB820c-DB845c-move-to-Qualcomm-tree.patch of Package alsa-ucm-conf (Revision 5e25f4f77fddb826984e442af0f75c3f)

Currently displaying revision 5e25f4f77fddb826984e442af0f75c3f , Show latest

From 73c105b4707b601de63d1f24641e65e5ac23f3a6 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 25 Jun 2020 16:55:42 +0200
Subject: [PATCH 22/51] DB820c/DB845c: move to Qualcomm/ tree

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 ucm2/DB820c/DB820c.conf            |  11 ----
 ucm2/DB820c/HDMI.conf              |  33 ------------
 ucm2/DB820c/HiFi.conf              | 100 -------------------------------------
 ucm2/DB845c/DB845c.conf            |  11 ----
 ucm2/DB845c/HDMI.conf              |  26 ----------
 ucm2/DB845c/HiFi.conf              |  39 ---------------
 ucm2/Qualcomm/apq8016/HDMI.conf    |  33 ++++++++++++
 ucm2/Qualcomm/apq8016/HiFi.conf    | 100 +++++++++++++++++++++++++++++++++++++
 ucm2/Qualcomm/apq8016/apq8016.conf |  11 ++++
 ucm2/Qualcomm/sdm845/HDMI.conf     |  26 ++++++++++
 ucm2/Qualcomm/sdm845/HiFi.conf     |  39 +++++++++++++++
 ucm2/Qualcomm/sdm845/sdm845.conf   |  11 ++++
 ucm2/module/snd_soc_apq8096.conf   |   1 +
 ucm2/module/snd_soc_sdm845.conf    |   1 +
 14 files changed, 222 insertions(+), 220 deletions(-)
 delete mode 100644 ucm2/DB820c/DB820c.conf
 delete mode 100644 ucm2/DB820c/HDMI.conf
 delete mode 100644 ucm2/DB820c/HiFi.conf
 delete mode 100644 ucm2/DB845c/DB845c.conf
 delete mode 100644 ucm2/DB845c/HDMI.conf
 delete mode 100644 ucm2/DB845c/HiFi.conf
 create mode 100644 ucm2/Qualcomm/apq8016/HDMI.conf
 create mode 100644 ucm2/Qualcomm/apq8016/HiFi.conf
 create mode 100644 ucm2/Qualcomm/apq8016/apq8016.conf
 create mode 100644 ucm2/Qualcomm/sdm845/HDMI.conf
 create mode 100644 ucm2/Qualcomm/sdm845/HiFi.conf
 create mode 100644 ucm2/Qualcomm/sdm845/sdm845.conf
 create mode 120000 ucm2/module/snd_soc_apq8096.conf
 create mode 120000 ucm2/module/snd_soc_sdm845.conf

diff --git a/ucm2/DB820c/DB820c.conf b/ucm2/DB820c/DB820c.conf
deleted file mode 100644
index 7eab8aa9bb09..000000000000
--- a/ucm2/DB820c/DB820c.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-Syntax 2
-
-SectionUseCase."HiFi" {
-	File "HiFi.conf"
-	Comment "HiFi quality Music"
-}
-
-SectionUseCase."HDMI" {
-	File "HDMI.conf"
-	Comment "HDMI output"
-}
diff --git a/ucm2/DB820c/HDMI.conf b/ucm2/DB820c/HDMI.conf
deleted file mode 100644
index 5bdf07eac5c9..000000000000
--- a/ucm2/DB820c/HDMI.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-# Use case configuration for DB820c board.
-# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
-
-SectionVerb {
-	EnableSequence [
-		cset "name='HDMI Mixer MultiMedia1' 1"
-	]
-
-	DisableSequence [
-		cset "name='HDMI Mixer MultiMedia1' 0"
-	]
-
-	Value {
-		TQ "HiFi"
-	}
-}
-
-SectionDevice."HDMI" {
-	Comment "HDMI Digital Stereo Output"
-
-	EnableSequence [
-		cset "name='HDMI Mixer MultiMedia1' 1"
-	]
-
-	DisableSequence [
-		cset "name='HDMI Mixer MultiMedia1' 0"
-	]
-
-	Value {
-		PlaybackPriority 200
-		PlaybackPCM "plughw:${CardId}"
-	}
-}
diff --git a/ucm2/DB820c/HiFi.conf b/ucm2/DB820c/HiFi.conf
deleted file mode 100644
index 89280d72450c..000000000000
--- a/ucm2/DB820c/HiFi.conf
+++ /dev/null
@@ -1,100 +0,0 @@
-# Use case configuration for DB820c board.
-# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
-
-SectionVerb {
-
-	EnableSequence [
-		cset "name='SLIM RX0 MUX' ZERO"
-		cset "name='SLIM RX1 MUX' ZERO"
-		cset "name='SLIM RX2 MUX' ZERO"
-		cset "name='SLIM RX3 MUX' ZERO"
-		cset "name='SLIM RX4 MUX' ZERO"
-		cset "name='SLIM RX5 MUX' AIF4_PB"
-		cset "name='SLIM RX6 MUX' AIF4_PB"
-		cset "name='SLIM RX7 MUX' ZERO"
-		cset "name='RX INT1_2 MUX' RX5"
-		cset "name='RX INT2_2 MUX' RX6"
-		## gain to  0dB
-		cset "name='RX5 Digital Volume' 68"
-		## gain to  0dB
-		cset "name='RX6 Digital Volume' 68"
-		cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 1"
-		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1"
-		cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT"
-		cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT"
-		cset "name='AIF1_CAP Mixer SLIM TX0' 1"
-		cset "name='SLIM TX0 MUX' DEC0"
-		cset "name='ADC2 Volume' 12"
-		cset "name='ADC MUX0' AMIC"
-		cset "name='AMIC MUX0' ADC2"
-	]
-
-	DisableSequence [
-		cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 0"
-		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0"
-	]
-}
-
-SectionDevice."Headphones" {
-	Comment "Headphones playback"
-
-	EnableSequence [
-		cset "name='SLIM RX0 MUX' ZERO"
-		cset "name='SLIM RX1 MUX' ZERO"
-		cset "name='SLIM RX2 MUX' ZERO"
-		cset "name='SLIM RX3 MUX' ZERO"
-		cset "name='SLIM RX4 MUX' ZERO"
-		cset "name='SLIM RX5 MUX' AIF4_PB"
-		cset "name='SLIM RX6 MUX' AIF4_PB"
-		cset "name='SLIM RX7 MUX' ZERO"
-		cset "name='RX INT1_2 MUX' RX5"
-		cset "name='RX INT2_2 MUX' RX6"
-		## gain to  0dB
-		cset "name='RX5 Digital Volume' 68"
-		## gain to  0dB
-		cset "name='RX6 Digital Volume' 68"
-		cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 1"
-		cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT"
-		cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT"
-	]
-
-	DisableSequence [
-		cset "name='RX5 Digital Volume' 0"
-		cset "name='RX6 Digital Volume' 0"
-		cset "name='SLIM RX5 MUX' ZERO"
-		cset "name='SLIM RX6 MUX' ZERO"
-		cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 0"
-	]
-
-	Value {
-		PlaybackPriority 100
-		PlaybackPCM "plughw:${CardId},1"
-	}
-}
-
-SectionDevice."Headset" {
-	Comment "Headset Microphone"
-
-	EnableSequence [
-		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1"
-		cset "name='AIF1_CAP Mixer SLIM TX0' 1"
-		cset "name='SLIM TX0 MUX' DEC0"
-		cset "name='ADC2 Volume' 12"
-		cset "name='ADC MUX0' AMIC"
-		cset "name='AMIC MUX0' ADC2"
-	]
-
-	DisableSequence [
-		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0"
-		cset "name='AIF1_CAP Mixer SLIM TX0' 0"
-		cset "name='AMIC MUX0' ZERO"
-		cset "name='SLIM TX0 MUX' ZERO"
-		cset "name='ADC2 Volume' 0"
-	]
-
-	Value {
-		CapturePriority 100
-		CapturePCM "plughw:${CardId},2"
-		CaptureChannels 1
-	}
-}
diff --git a/ucm2/DB845c/DB845c.conf b/ucm2/DB845c/DB845c.conf
deleted file mode 100644
index 84296d1cee28..000000000000
--- a/ucm2/DB845c/DB845c.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-Syntax 3
-
-SectionUseCase."HiFi" {
-	File "HiFi.conf"
-	Comment "HiFi quality Music."
-}
-
-SectionUseCase."HDMI" {
-	File "HDMI.conf"
-	Comment "HDMI output."
-}
diff --git a/ucm2/DB845c/HDMI.conf b/ucm2/DB845c/HDMI.conf
deleted file mode 100644
index 18448837d5d9..000000000000
--- a/ucm2/DB845c/HDMI.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# Use case configuration for DB845c board.
-# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
-
-SectionVerb {
-	EnableSequence [
-		cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1"
-	]
-
-	DisableSequence [
-		cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 0"
-	]
-
-	Value {
-		TQ "HiFi"
-	}
-}
-
-SectionDevice."HDMI" {
-	#Name "HDMI"
-	Comment "HDMI Digital Stereo Output"
-
-	Value {
-		PlaybackPCM "hw:${CardId}"
-		PlaybackPriority 200
-	}
-}
diff --git a/ucm2/DB845c/HiFi.conf b/ucm2/DB845c/HiFi.conf
deleted file mode 100644
index 1ef57c1e6019..000000000000
--- a/ucm2/DB845c/HiFi.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-# Use case configuration for DB845c.
-# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
-
-SectionVerb {
-
-	EnableSequence [
-		cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 1"
-	]
-
-	Include.wcde.File "/codecs/wcd934x/DefaultEnableSeq.conf"
-	Include.wsae.File "/codecs/wsa881x/DefaultEnableSeq.conf"
-
-	Include.wcdd {
-		File "/codecs/wcd934x/DefaultDisableSeq.conf"
-		Before.DisableSequence "0"
-	}
-
-	DisableSequence [
-		cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 0"
-	]
-
-	Value {
-		TQ "HiFi"
-	}
-}
-
-SectionDevice."Speaker" {
-	Comment "Speaker playback"
-
-	Include.wcde.File "/codecs/wcd934x/SpeakerEnableSeq.conf"
-	Include.wsae.File "/codecs/wsa881x/SpeakerEnableSeq.conf"
-	Include.wsad.File "/codecs/wsa881x/SpeakerDisableSeq.conf"
-	Include.wcdd.File "/codecs/wcd934x/SpeakerDisableSeq.conf"
-
-	Value {
-		PlaybackPriority 100
-		PlaybackPCM "hw:${CardId},1"
-	}
-}
diff --git a/ucm2/Qualcomm/apq8016/HDMI.conf b/ucm2/Qualcomm/apq8016/HDMI.conf
new file mode 100644
index 000000000000..5bdf07eac5c9
--- /dev/null
+++ b/ucm2/Qualcomm/apq8016/HDMI.conf
@@ -0,0 +1,33 @@
+# Use case configuration for DB820c board.
+# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
+
+SectionVerb {
+	EnableSequence [
+		cset "name='HDMI Mixer MultiMedia1' 1"
+	]
+
+	DisableSequence [
+		cset "name='HDMI Mixer MultiMedia1' 0"
+	]
+
+	Value {
+		TQ "HiFi"
+	}
+}
+
+SectionDevice."HDMI" {
+	Comment "HDMI Digital Stereo Output"
+
+	EnableSequence [
+		cset "name='HDMI Mixer MultiMedia1' 1"
+	]
+
+	DisableSequence [
+		cset "name='HDMI Mixer MultiMedia1' 0"
+	]
+
+	Value {
+		PlaybackPriority 200
+		PlaybackPCM "plughw:${CardId}"
+	}
+}
diff --git a/ucm2/Qualcomm/apq8016/HiFi.conf b/ucm2/Qualcomm/apq8016/HiFi.conf
new file mode 100644
index 000000000000..89280d72450c
--- /dev/null
+++ b/ucm2/Qualcomm/apq8016/HiFi.conf
@@ -0,0 +1,100 @@
+# Use case configuration for DB820c board.
+# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
+
+SectionVerb {
+
+	EnableSequence [
+		cset "name='SLIM RX0 MUX' ZERO"
+		cset "name='SLIM RX1 MUX' ZERO"
+		cset "name='SLIM RX2 MUX' ZERO"
+		cset "name='SLIM RX3 MUX' ZERO"
+		cset "name='SLIM RX4 MUX' ZERO"
+		cset "name='SLIM RX5 MUX' AIF4_PB"
+		cset "name='SLIM RX6 MUX' AIF4_PB"
+		cset "name='SLIM RX7 MUX' ZERO"
+		cset "name='RX INT1_2 MUX' RX5"
+		cset "name='RX INT2_2 MUX' RX6"
+		## gain to  0dB
+		cset "name='RX5 Digital Volume' 68"
+		## gain to  0dB
+		cset "name='RX6 Digital Volume' 68"
+		cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 1"
+		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1"
+		cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT"
+		cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT"
+		cset "name='AIF1_CAP Mixer SLIM TX0' 1"
+		cset "name='SLIM TX0 MUX' DEC0"
+		cset "name='ADC2 Volume' 12"
+		cset "name='ADC MUX0' AMIC"
+		cset "name='AMIC MUX0' ADC2"
+	]
+
+	DisableSequence [
+		cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 0"
+		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0"
+	]
+}
+
+SectionDevice."Headphones" {
+	Comment "Headphones playback"
+
+	EnableSequence [
+		cset "name='SLIM RX0 MUX' ZERO"
+		cset "name='SLIM RX1 MUX' ZERO"
+		cset "name='SLIM RX2 MUX' ZERO"
+		cset "name='SLIM RX3 MUX' ZERO"
+		cset "name='SLIM RX4 MUX' ZERO"
+		cset "name='SLIM RX5 MUX' AIF4_PB"
+		cset "name='SLIM RX6 MUX' AIF4_PB"
+		cset "name='SLIM RX7 MUX' ZERO"
+		cset "name='RX INT1_2 MUX' RX5"
+		cset "name='RX INT2_2 MUX' RX6"
+		## gain to  0dB
+		cset "name='RX5 Digital Volume' 68"
+		## gain to  0dB
+		cset "name='RX6 Digital Volume' 68"
+		cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 1"
+		cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT"
+		cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT"
+	]
+
+	DisableSequence [
+		cset "name='RX5 Digital Volume' 0"
+		cset "name='RX6 Digital Volume' 0"
+		cset "name='SLIM RX5 MUX' ZERO"
+		cset "name='SLIM RX6 MUX' ZERO"
+		cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 0"
+	]
+
+	Value {
+		PlaybackPriority 100
+		PlaybackPCM "plughw:${CardId},1"
+	}
+}
+
+SectionDevice."Headset" {
+	Comment "Headset Microphone"
+
+	EnableSequence [
+		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1"
+		cset "name='AIF1_CAP Mixer SLIM TX0' 1"
+		cset "name='SLIM TX0 MUX' DEC0"
+		cset "name='ADC2 Volume' 12"
+		cset "name='ADC MUX0' AMIC"
+		cset "name='AMIC MUX0' ADC2"
+	]
+
+	DisableSequence [
+		cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0"
+		cset "name='AIF1_CAP Mixer SLIM TX0' 0"
+		cset "name='AMIC MUX0' ZERO"
+		cset "name='SLIM TX0 MUX' ZERO"
+		cset "name='ADC2 Volume' 0"
+	]
+
+	Value {
+		CapturePriority 100
+		CapturePCM "plughw:${CardId},2"
+		CaptureChannels 1
+	}
+}
diff --git a/ucm2/Qualcomm/apq8016/apq8016.conf b/ucm2/Qualcomm/apq8016/apq8016.conf
new file mode 100644
index 000000000000..538c7984e180
--- /dev/null
+++ b/ucm2/Qualcomm/apq8016/apq8016.conf
@@ -0,0 +1,11 @@
+Syntax 2
+
+SectionUseCase."HiFi" {
+	File "/Qualcomm/apq8016/HiFi.conf"
+	Comment "HiFi quality Music"
+}
+
+SectionUseCase."HDMI" {
+	File "/Qualcomm/apq8016/HDMI.conf"
+	Comment "HDMI output"
+}
diff --git a/ucm2/Qualcomm/sdm845/HDMI.conf b/ucm2/Qualcomm/sdm845/HDMI.conf
new file mode 100644
index 000000000000..18448837d5d9
--- /dev/null
+++ b/ucm2/Qualcomm/sdm845/HDMI.conf
@@ -0,0 +1,26 @@
+# Use case configuration for DB845c board.
+# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
+
+SectionVerb {
+	EnableSequence [
+		cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1"
+	]
+
+	DisableSequence [
+		cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 0"
+	]
+
+	Value {
+		TQ "HiFi"
+	}
+}
+
+SectionDevice."HDMI" {
+	#Name "HDMI"
+	Comment "HDMI Digital Stereo Output"
+
+	Value {
+		PlaybackPCM "hw:${CardId}"
+		PlaybackPriority 200
+	}
+}
diff --git a/ucm2/Qualcomm/sdm845/HiFi.conf b/ucm2/Qualcomm/sdm845/HiFi.conf
new file mode 100644
index 000000000000..1ef57c1e6019
--- /dev/null
+++ b/ucm2/Qualcomm/sdm845/HiFi.conf
@@ -0,0 +1,39 @@
+# Use case configuration for DB845c.
+# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
+
+SectionVerb {
+
+	EnableSequence [
+		cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 1"
+	]
+
+	Include.wcde.File "/codecs/wcd934x/DefaultEnableSeq.conf"
+	Include.wsae.File "/codecs/wsa881x/DefaultEnableSeq.conf"
+
+	Include.wcdd {
+		File "/codecs/wcd934x/DefaultDisableSeq.conf"
+		Before.DisableSequence "0"
+	}
+
+	DisableSequence [
+		cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 0"
+	]
+
+	Value {
+		TQ "HiFi"
+	}
+}
+
+SectionDevice."Speaker" {
+	Comment "Speaker playback"
+
+	Include.wcde.File "/codecs/wcd934x/SpeakerEnableSeq.conf"
+	Include.wsae.File "/codecs/wsa881x/SpeakerEnableSeq.conf"
+	Include.wsad.File "/codecs/wsa881x/SpeakerDisableSeq.conf"
+	Include.wcdd.File "/codecs/wcd934x/SpeakerDisableSeq.conf"
+
+	Value {
+		PlaybackPriority 100
+		PlaybackPCM "hw:${CardId},1"
+	}
+}
diff --git a/ucm2/Qualcomm/sdm845/sdm845.conf b/ucm2/Qualcomm/sdm845/sdm845.conf
new file mode 100644
index 000000000000..097c1d4e2f2c
--- /dev/null
+++ b/ucm2/Qualcomm/sdm845/sdm845.conf
@@ -0,0 +1,11 @@
+Syntax 3
+
+SectionUseCase."HiFi" {
+	File "/Qualcomm/sdm845/HiFi.conf"
+	Comment "HiFi quality Music."
+}
+
+SectionUseCase."HDMI" {
+	File "/Qualcomm/sdm845/HDMI.conf"
+	Comment "HDMI output."
+}
diff --git a/ucm2/module/snd_soc_apq8096.conf b/ucm2/module/snd_soc_apq8096.conf
new file mode 120000
index 000000000000..9afc13c79031
--- /dev/null
+++ b/ucm2/module/snd_soc_apq8096.conf
@@ -0,0 +1 @@
+../Qualcomm/apq8016/apq8016.conf
\ No newline at end of file
diff --git a/ucm2/module/snd_soc_sdm845.conf b/ucm2/module/snd_soc_sdm845.conf
new file mode 120000
index 000000000000..ce04e6a98713
--- /dev/null
+++ b/ucm2/module/snd_soc_sdm845.conf
@@ -0,0 +1 @@
+../Qualcomm/sdm845/sdm845.conf
\ No newline at end of file
-- 
2.16.4

Places

File 0022-DB820c-DB845c-move-to-Qualcomm-tree.patch of Package alsa-ucm-conf (Revision 5e25f4f77fddb826984e442af0f75c3f)

Places