ucm-conf: Add intel UCM conf files to alsa-ucm-conf repo

PATCH Superseded [email protected] 2 participants 6 messages Mar 15, 2017 – Mar 21, 2017 Kbuild

lore

Share & tools

lore

[email protected]

author

2017-03-15 06:46 UTC #0 lore raw

cover ucm-conf: Add intel UCM conf files to alsa-ucm-conf repo

From: Fuwei Tang <[email protected]>

Add the intel UCM configs to a dedicated UCM conf repo.License can be changed to BSD for intel files,and left as "unknown" for other conf files when they are moved from alsa-lib to the new repo.The alsa-lib LGPL license does not cover runtime configuration files.

The configs are moved from alsa-lib repo.The original authorship and commit message of all config files will be reserved.

I write the setup code from scratch instead of copying it from Takashi in this version.

Fuwei Tang (1):
ucm-conf: Set up for installation

Vinod Koul (2):
ucm-conf: broxton: add broxton-rt298 conf files
ucm-conf: skylake: add skylake-rt286 conf files

 .gitignore                       |  13 ++++
 ChangeLog                        |   1 +
 INSTALL                          |   1 +
 Makefile.am                      |   1 +
 broxton-rt298/Hdmi1              |  22 +++++++
 broxton-rt298/Hdmi2              |  14 +++++
 broxton-rt298/HiFi               | 129 +++++++++++++++++++++++++++++++++++++++
 broxton-rt298/Makefile.am        |   4 ++
 broxton-rt298/broxton-rt298.conf |  58 ++++++++++++++++++
 configure.ac                     |  24 ++++++++
 gitcompile                       |   5 ++
 skylake-rt286/Hdmi1              |  20 ++++++
 skylake-rt286/Hdmi2              |  20 ++++++
 skylake-rt286/HiFi               | 129 +++++++++++++++++++++++++++++++++++++++
 skylake-rt286/Makefile.am        |   4 ++
 skylake-rt286/skylake-rt286.conf |  60 ++++++++++++++++++
 16 files changed, 505 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 ChangeLog
 create mode 120000 INSTALL
 create mode 100644 Makefile.am
 create mode 100644 broxton-rt298/Hdmi1
 create mode 100644 broxton-rt298/Hdmi2
 create mode 100644 broxton-rt298/HiFi
 create mode 100644 broxton-rt298/Makefile.am
 create mode 100644 broxton-rt298/broxton-rt298.conf
 create mode 100644 configure.ac
 create mode 100755 gitcompile
 create mode 100644 skylake-rt286/Hdmi1
 create mode 100644 skylake-rt286/Hdmi2
 create mode 100644 skylake-rt286/HiFi
 create mode 100644 skylake-rt286/Makefile.am
 create mode 100644 skylake-rt286/skylake-rt286.conf

Signature · 1 line

2.7.4

[email protected]

author

2017-03-15 06:46 UTC #1 lore raw

PATCH 1/3 ucm-conf: Set up for installation

From: Fuwei Tang <[email protected]>

This add autoconf and automake script and Makefile.am for conf files to be installed automatically.

Signed-off-by Fuwei Tang <[email protected]>

Reviewed-by Liam Girdwood <[email protected]>

Reviewed-by Vinod Koul <[email protected]>

Reviewed-by Mengdong Lin <[email protected]>

.gitignore new file +13 -0

new file mode 100644
index 0000000..e612a96
@@ -0,0 +1,13 @@
+aclocal.m4
+AUTHORS
+autom4te.cache
+autoscan.log
+config.log
+config.status
+configure
+install-sh
+Makefile
+Makefile.in
+missing
+NEWS
+COPYING

ChangeLog new file +1 -0

new file mode 100644
index 0000000..2a8eb65
@@ -0,0 +1 @@
+Move all conf files to alsa-ucm-conf repo from alsa-lib repo.

INSTALL new file +1 -0

new file mode 120000
index 0000000..ddcdb76
@@ -0,0 +1 @@
+/usr/share/automake-1.15/INSTALL
\ No newline at end of file

Makefile.am new file +1 -0

new file mode 100644
index 0000000..e2baa04
@@ -0,0 +1 @@
+SUBDIRS=

configure.ac new file +22 -0

new file mode 100644
index 0000000..8aac3c8
@@ -0,0 +1,22 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.69])
+AC_INIT(alsa-ucm, 1.1.3)
+AM_INIT_AUTOMAKE
+# Checks for programs.
+
+# Checks for libraries.
+
+# Checks for header files.
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+AC_CONFIG_FILES([Makefile])
+
+ALSA_CONFIG_DIR="/usr/share/alsa"
+AC_SUBST(ALSA_CONFIG_DIR)
+
+AC_OUTPUT
+

gitcompile new file +5 -0

new file mode 100755
index 0000000..fff6769
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+aclocal
+autoconf
+automake --add-missing

Signature · 1 line

2.7.4

Takashi Iwai

2017-03-20 11:54 UTC #2 lore raw

Re: [PATCH v1 1/3] ucm-conf: Set up for installation

Quoted 66 lines · On Wed, 15 Mar 2017 07:47:01 +0100, [email protected] wrote:

From: Fuwei Tang <[email protected]>
This add autoconf and automake script and Makefile.am for conf files to be installed automatically.
Signed-off-by Fuwei Tang <[email protected]>
Reviewed-by Liam Girdwood <[email protected]>
Reviewed-by Vinod Koul <[email protected]>
Reviewed-by Mengdong Lin <[email protected]>
.gitignore new file +13 -0
new file mode 100644
index 0000000..e612a96
@@ -0,0 +1,13 @@
+aclocal.m4
+AUTHORS
+autom4te.cache
+autoscan.log
+config.log
+config.status
+configure
+install-sh
+Makefile
+Makefile.in
+missing
+NEWS
+COPYING
ChangeLog new file +1 -0
new file mode 100644
index 0000000..2a8eb65
@@ -0,0 +1 @@
+Move all conf files to alsa-ucm-conf repo from alsa-lib repo.
INSTALL new file +1 -0
new file mode 120000
index 0000000..ddcdb76
@@ -0,0 +1 @@
+/usr/share/automake-1.15/INSTALL
\ No newline at end of file
Makefile.am new file +1 -0
new file mode 100644
index 0000000..e2baa04
@@ -0,0 +1 @@
+SUBDIRS=
configure.ac new file +9 -0
new file mode 100644
index 0000000..8aac3c8
@@ -0,0 +1,22 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.69])
+AC_INIT(alsa-ucm, 1.1.3)
+AM_INIT_AUTOMAKE
+# Checks for programs.
+
+# Checks for libraries.

configure.ac line 19

Quoted 10 lines

configure.ac new file +10 -0

+
+# Checks for header files.
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+AC_CONFIG_FILES([Makefile])
+
+ALSA_CONFIG_DIR="/usr/share/alsa"
+AC_SUBST(ALSA_CONFIG_DIR)

Why not make it configurable?

Takashi

Tang, FuweiX

author

2017-03-21 01:03 UTC #3 lore raw

Re: [PATCH v1 1/3] ucm-conf: Set up for installation

Quoted 91 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Monday, March 20, 2017 7:54 PM
To: Tang, FuweiX <[email protected]>
Cc: [email protected]; [email protected]; Lin, Mengdong <[email protected]>
Subject: Re: [alsa-devel] [PATCH v1 1/3] ucm-conf: Set up for installation
Quoted 4 lines · On Wed, 15 Mar 2017 07:47:01 +0100, [email protected] wrote:
From: Fuwei Tang <[email protected]>
This add autoconf and automake script and Makefile.am for conf files to be
installed automatically.
Quoted 60 lines
Signed-off-by Fuwei Tang <[email protected]>
Reviewed-by Liam Girdwood <[email protected]>
Reviewed-by Vinod Koul <[email protected]>
Reviewed-by Mengdong Lin <[email protected]>
.gitignore new file +13 -0
new file mode 100644
index 0000000..e612a96
@@ -0,0 +1,13 @@
+aclocal.m4
+AUTHORS
+autom4te.cache
+autoscan.log
+config.log
+config.status
+configure
+install-sh
+Makefile
+Makefile.in
+missing
+NEWS
+COPYING
ChangeLog new file +1 -0
new file mode 100644
index 0000000..2a8eb65
@@ -0,0 +1 @@
+Move all conf files to alsa-ucm-conf repo from alsa-lib repo.
INSTALL new file +1 -0
new file mode 120000
index 0000000..ddcdb76
@@ -0,0 +1 @@
+/usr/share/automake-1.15/INSTALL
\ No newline at end of file
Makefile.am new file mode 100644 index renamed from Makefile.am +0 -0
0000000..e2baa04
Makefile.am new file +1 -0
@@ -0,0 +1 @@
+SUBDIRS=
configure.ac new file mode 100644 index renamed from configure.ac +0 -0
0000000..8aac3c8
configure.ac new file +9 -0
@@ -0,0 +1,22 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.69])
+AC_INIT(alsa-ucm, 1.1.3)
+AM_INIT_AUTOMAKE
+# Checks for programs.
+
+# Checks for libraries.
configure.ac line 19
Quoted 10 lines
configure.ac new file +10 -0
+
+# Checks for header files.
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+AC_CONFIG_FILES([Makefile])
+
+ALSA_CONFIG_DIR="/usr/share/alsa"
+AC_SUBST(ALSA_CONFIG_DIR)
Why not make it configurable?

Quoted 1 line

Takashi

Ok, I will do so. Thank you.

Fuwei

[email protected]

author

2017-03-15 06:46 UTC #4 lore raw

PATCH 2/3 ucm-conf: broxton: add broxton-rt298 conf files

In reply to [email protected]

From: Vinod Koul <[email protected]>

This adds the UCM conf files for broxton enabling with rt298 codec on I2S audio, HDMI and DMIC ports.

This patch is based on commit 360c976aaa05 ("conf/ucm: broxton: add broxton-rt298 conf files") from alsa-lib by Vinod Koul <[email protected]>.
Original authorship is retained.

Signed-off-by Nishit Sharma <[email protected]>

Signed-off-by G Kranthi <[email protected]>

Signed-off-by Vinod Koul <[email protected]>

Signed-off-by Fuwei Tang <[email protected]>

Reviewed-by Liam Girdwood <[email protected]>

Reviewed-by Vinod Koul <[email protected]>

Reviewed-by Mengdong Lin <[email protected]>

Makefile.am +1 -1

index e2baa04..5f86692 100644
@@ -1 +1 @@
-SUBDIRS=
+SUBDIRS=broxton-rt298

broxton-rt298/Hdmi1 new file +22 -0

new file mode 100644
index 0000000..48514f4
@@ -0,0 +1,22 @@
+# Usecase for device HDMI1/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms
+# For Audio in I2S mode
+
+SectionDevice."Hdmi1" {
+        Comment "HDMI/Display Port 1 Stereo"
+
+        EnableSequence [
+                exec "echo Hdmi1 EnableSequnece"
+        ]
+
+        DisableSequence [
+                exec "echo Hdmi1 DisableSequnece"
+        ]
+
+        Value {
+                PlaybackPCM "hw:broxtonrt298,4"
+                PlaybackChannels "2"
+                PlaybackPriority "3"
+                JackControl "HDMI/DP, pcm=4 Jack"
+        }
+}
+

broxton-rt298/Hdmi2 new file +14 -0

new file mode 100644
index 0000000..764f8b9
@@ -0,0 +1,14 @@
+# Usecase for device HDMI2/Display Port stereo playback on Intel Broxton platforms
+# For Audio in I2S mode
+
+SectionDevice."Hdmi2" {
+        Comment "HDMI/Display Port 2 Stereo"
+
+        Value {
+                PlaybackPCM "hw:broxtonrt298,5"
+                PlaybackChannels "2"
+                PlaybackPriority "4"
+                JackControl "HDMI/DP, pcm=5 Jack"
+        }
+}
+

broxton-rt298/HiFi new file +129 -0

129 lines not on this page · raw message

broxton-rt298/Makefile.am new file +4 -0

new file mode 100644
index 0000000..80f480e
@@ -0,0 +1,4 @@
+alsaconfigdir = @ALSA_CONFIG_DIR@
+ucmdir = $(alsaconfigdir)/ucm/broxton-rt298
+ucm_DATA = broxton-rt298.conf HiFi Hdmi1 Hdmi2
+EXTRA_DIST = $(ucm_DATA)

broxton-rt298/broxton-rt298.conf new file +58 -0

58 lines not on this page · raw message

configure.ac +2 -1

index 8aac3c8..1105dfc 100644
@@ -13,7 +13,8 @@ AM_INIT_AUTOMAKE
 # Checks for typedefs, structures, and compiler characteristics.
 
 # Checks for library functions.
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile
+		 broxton-rt298/Makefile])
 
 ALSA_CONFIG_DIR="/usr/share/alsa"
 AC_SUBST(ALSA_CONFIG_DIR)

Signature · 1 line

2.7.4

[email protected]

author

2017-03-15 06:47 UTC #5 lore raw

PATCH 3/3 ucm-conf: skylake: add skylake-rt286 conf files

In reply to [email protected]

From: Vinod Koul <[email protected]>

This add the UCM conf files for skylake enabling I2S audio, HDMI and DMIC ports.

This patch is based on commit 4dfae1adb314 ("conf/ucm: skylake: add skylake-rt286 conf files") from alsa-lib by Vinod Koul <[email protected]>.
Original authorship is retained.

Signed-off-by Karthik D M <[email protected]>

Signed-off-by Nishit Sharma <[email protected]>

Signed-off-by Jeeja KP <[email protected]>

Signed-off-by Vinod Koul <[email protected]>

Signed-off-by Fuwei Tang <[email protected]>

Reviewed-by Liam Girdwood <[email protected]>

Reviewed-by Vinod Koul <[email protected]>

Reviewed-by Mengdong Lin <[email protected]>

Makefile.am +1 -1

index 5f86692..f351b75 100644
@@ -1 +1 @@
-SUBDIRS=broxton-rt298
+SUBDIRS=broxton-rt298 skylake-rt286

configure.ac +2 -1

index 1105dfc..53144b5 100644
@@ -14,7 +14,8 @@ AM_INIT_AUTOMAKE
 
 # Checks for library functions.
 AC_CONFIG_FILES([Makefile
-		 broxton-rt298/Makefile])
+		 broxton-rt298/Makefile
+		 skylake-rt286/Makefile])
 
 ALSA_CONFIG_DIR="/usr/share/alsa"
 AC_SUBST(ALSA_CONFIG_DIR)

skylake-rt286/Hdmi1 new file +20 -0

new file mode 100644
index 0000000..0e00fc8
@@ -0,0 +1,20 @@
+# Usecase for device HDMI1/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms
+# For Audio in I2S mode
+
+SectionDevice."Hdmi1" {
+        Comment "HDMI/Display Port 1 Stereo"
+
+        EnableSequence [
+        ]
+
+        DisableSequence [
+        ]
+
+        Value {
+                PlaybackPCM "hw:skylakert286,4"
+                PlaybackChannels "2"
+                PlaybackPriority "3"
+                JackControl "HDMI/DP, pcm=4 Jack"
+        }
+}
+

skylake-rt286/Hdmi2 new file +20 -0

new file mode 100644
index 0000000..89b31aa
@@ -0,0 +1,20 @@
+# Usecase for device HDMI2/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms
+# For Audio in I2S mode
+
+SectionDevice."Hdmi2" {
+        Comment "HDMI/Display Port 2 Stereo"
+
+        EnableSequence [
+        ]
+
+        DisableSequence [
+        ]
+
+        Value {
+                PlaybackPCM "hw:skylakert286,5"
+                PlaybackChannels "2"
+                PlaybackPriority "4"
+                JackControl "HDMI/DP, pcm=5 Jack"
+        }
+}
+

skylake-rt286/HiFi new file +129 -0

129 lines not on this page · raw message

skylake-rt286/Makefile.am new file +4 -0

new file mode 100644
index 0000000..9d6a85a
@@ -0,0 +1,4 @@
+alsaconfigdir = @ALSA_CONFIG_DIR@
+ucmdir = $(alsaconfigdir)/ucm/skylake-rt286
+ucm_DATA = skylake-rt286.conf HiFi Hdmi1 Hdmi2
+EXTRA_DIST = $(ucm_DATA)

skylake-rt286/skylake-rt286.conf new file +60 -0

60 lines not on this page · raw message

Signature · 1 line

2.7.4