From 3bfe5eeb03c3e9fabb9cd8f5b83818c4cfcb74a7 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 31 May 2021 13:26:14 +0200
Subject: [PATCH 1/4] tegra: shuffle Acer Iconia Tab A500 files
BugLink: https://github.com/alsa-project/alsa-ucm-conf/pull/94
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
...r Iconia Tab A500 WM8903.conf => Acer-A500-HiFi.conf} | 0
ucm2/Tegra/wm8903/Acer-A500.conf | 8 ++++++++
ucm2/conf.d/tegra/Acer Iconia Tab A500 WM8903.conf | 9 +--------
3 files changed, 9 insertions(+), 8 deletions(-)
rename ucm2/Tegra/wm8903/{Acer Iconia Tab A500 WM8903.conf => Acer-A500-HiFi.conf} (100%)
create mode 100644 ucm2/Tegra/wm8903/Acer-A500.conf
mode change 100644 => 120000 ucm2/conf.d/tegra/Acer Iconia Tab A500 WM8903.conf
diff --git a/ucm2/Tegra/wm8903/Acer Iconia Tab A500 WM8903.conf b/ucm2/Tegra/wm8903/Acer-A500-HiFi.conf
similarity index 100%
rename from ucm2/Tegra/wm8903/Acer Iconia Tab A500 WM8903.conf
rename to ucm2/Tegra/wm8903/Acer-A500-HiFi.conf
diff --git a/ucm2/Tegra/wm8903/Acer-A500.conf b/ucm2/Tegra/wm8903/Acer-A500.conf
new file mode 100644
index 0000000..e9bd6c4
--- /dev/null
+++ b/ucm2/Tegra/wm8903/Acer-A500.conf
@@ -0,0 +1,8 @@
+# Use case Configuration for Acer Iconia Tab A500
+
+Syntax 4
+
+SectionUseCase."HiFi" {
+ File "/Tegra/wm8903/Acer-A500-HiFi.conf"
+ Comment "Play HiFi quality Music"
+}
diff --git a/ucm2/conf.d/tegra/Acer Iconia Tab A500 WM8903.conf b/ucm2/conf.d/tegra/Acer Iconia Tab A500 WM8903.conf
deleted file mode 100644
index 1489344..0000000
--- a/ucm2/conf.d/tegra/Acer Iconia Tab A500 WM8903.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Use case Configuration for Acer Iconia Tab A500
-
-Syntax 4
-
-SectionUseCase."HiFi" {
- File "/Tegra/wm8903/Acer Iconia Tab A500 WM8903.conf"
- Comment "Play HiFi quality Music"
-}
diff --git a/ucm2/conf.d/tegra/Acer Iconia Tab A500 WM8903.conf b/ucm2/conf.d/tegra/Acer Iconia Tab A500 WM8903.conf
new file mode 120000
index 0000000..d000c29
--- /dev/null
+++ b/ucm2/conf.d/tegra/Acer Iconia Tab A500 WM8903.conf
@@ -0,0 +1 @@
+../../Tegra/wm8903/Acer-A500.conf
\ No newline at end of file
--
2.30.2
From 4136b2276e5663a60374d0e2adca54f6861dbafe Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 31 May 2021 13:31:54 +0200
Subject: [PATCH 2/4] tegra: shuffle ASUS Google Nexus 7 files
BugLink: https://github.com/alsa-project/alsa-ucm-conf/pull/94
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
...gle Nexus 7 ALC5642.conf => Google-Nexus-7-HiFi.conf} | 0
ucm2/Tegra/rt5640/Google-Nexus-7.conf | 8 ++++++++
ucm2/conf.d/tegra/ASUS Google Nexus 7 ALC5642.conf | 9 +--------
3 files changed, 9 insertions(+), 8 deletions(-)
rename ucm2/Tegra/rt5640/{ASUS Google Nexus 7 ALC5642.conf => Google-Nexus-7-HiFi.conf} (100%)
create mode 100644 ucm2/Tegra/rt5640/Google-Nexus-7.conf
mode change 100644 => 120000 ucm2/conf.d/tegra/ASUS Google Nexus 7 ALC5642.conf
diff --git a/ucm2/Tegra/rt5640/ASUS Google Nexus 7 ALC5642.conf b/ucm2/Tegra/rt5640/Google-Nexus-7-HiFi.conf
similarity index 100%
rename from ucm2/Tegra/rt5640/ASUS Google Nexus 7 ALC5642.conf
rename to ucm2/Tegra/rt5640/Google-Nexus-7-HiFi.conf
diff --git a/ucm2/Tegra/rt5640/Google-Nexus-7.conf b/ucm2/Tegra/rt5640/Google-Nexus-7.conf
new file mode 100644
index 0000000..1ec7b92
--- /dev/null
+++ b/ucm2/Tegra/rt5640/Google-Nexus-7.conf
@@ -0,0 +1,8 @@
+# Use case Configuration for ASUS Google Nexus 7 (2012)
+
+Syntax 4
+
+SectionUseCase."HiFi" {
+ File "/Tegra/rt5640/Google-Nexus-7-HiFi.conf"
+ Comment "Play HiFi quality Music"
+}
diff --git a/ucm2/conf.d/tegra/ASUS Google Nexus 7 ALC5642.conf b/ucm2/conf.d/tegra/ASUS Google Nexus 7 ALC5642.conf
deleted file mode 100644
index 1a0978c..0000000
--- a/ucm2/conf.d/tegra/ASUS Google Nexus 7 ALC5642.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Use case Configuration for ASUS Google Nexus 7 (2012)
-
-Syntax 4
-
-SectionUseCase."HiFi" {
- File "/Tegra/rt5640/ASUS Google Nexus 7 ALC5642.conf"
- Comment "Play HiFi quality Music"
-}
diff --git a/ucm2/conf.d/tegra/ASUS Google Nexus 7 ALC5642.conf b/ucm2/conf.d/tegra/ASUS Google Nexus 7 ALC5642.conf
new file mode 120000
index 0000000..e598c9c
--- /dev/null
+++ b/ucm2/conf.d/tegra/ASUS Google Nexus 7 ALC5642.conf
@@ -0,0 +1 @@
+../../Tegra/rt5640/Google-Nexus-7.conf
\ No newline at end of file
--
2.30.2
From 3f34021beffba4e39f064a14c5faceeaa224b766 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 1 Jun 2021 21:08:53 +0200
Subject: [PATCH 3/4] HDA-Intel: the lookups are supported from syntax 4
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/HDA-Intel/HDA-Intel.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ucm2/HDA-Intel/HDA-Intel.conf b/ucm2/HDA-Intel/HDA-Intel.conf
index 5794e72..8a8e0e7 100644
--- a/ucm2/HDA-Intel/HDA-Intel.conf
+++ b/ucm2/HDA-Intel/HDA-Intel.conf
@@ -1,4 +1,4 @@
-Syntax 3
+Syntax 4
Define.Use "" # a non-empty string to use UCM configuration for HDA devices
--
2.30.2
From a4cd64da90d01dc801b1887a7f835420512d0f17 Mon Sep 17 00:00:00 2001
From: Svyatoslav Ryhel <clamor95@gmail.com>
Date: Mon, 31 May 2021 11:27:36 +0300
Subject: [PATCH 4/4] tegra: Add UCM for Nvidia Tegra HDMI Audio
Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/94
Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/Tegra/tegra-hda/tegra-hda-HiFi.conf | 12 ++++++++++++
ucm2/Tegra/tegra-hda/tegra-hda.conf | 8 ++++++++
ucm2/conf.d/tegra-hda/tegra-hda.conf | 1 +
3 files changed, 21 insertions(+)
create mode 100644 ucm2/Tegra/tegra-hda/tegra-hda-HiFi.conf
create mode 100644 ucm2/Tegra/tegra-hda/tegra-hda.conf
create mode 120000 ucm2/conf.d/tegra-hda/tegra-hda.conf
diff --git a/ucm2/Tegra/tegra-hda/tegra-hda-HiFi.conf b/ucm2/Tegra/tegra-hda/tegra-hda-HiFi.conf
new file mode 100644
index 0000000..859c34f
--- /dev/null
+++ b/ucm2/Tegra/tegra-hda/tegra-hda-HiFi.conf
@@ -0,0 +1,12 @@
+If.hdmi {
+ Condition { Type String Empty "" }
+ True {
+ Define {
+ HdmiNum 1
+ HdmiPCM 3
+ HdmiCtlIndex 0
+ HdmiPrio 1100
+ }
+ Include.hdmi.File "/codecs/hda/hdmi.conf"
+ }
+}
diff --git a/ucm2/Tegra/tegra-hda/tegra-hda.conf b/ucm2/Tegra/tegra-hda/tegra-hda.conf
new file mode 100644
index 0000000..410d973
--- /dev/null
+++ b/ucm2/Tegra/tegra-hda/tegra-hda.conf
@@ -0,0 +1,8 @@
+# UCM for Nvidia Tegra30 HDMI Audio
+
+Syntax 4
+
+SectionUseCase."HiFi" {
+ File "/Tegra/tegra-hda/tegra-hda-HiFi.conf"
+ Comment "Play HiFi quality Music"
+}
diff --git a/ucm2/conf.d/tegra-hda/tegra-hda.conf b/ucm2/conf.d/tegra-hda/tegra-hda.conf
new file mode 120000
index 0000000..0b4867c
--- /dev/null
+++ b/ucm2/conf.d/tegra-hda/tegra-hda.conf
@@ -0,0 +1 @@
+../../Tegra/tegra-hda/tegra-hda.conf
\ No newline at end of file
--
2.30.2