Skip to contentSkip to conversation

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

PATCH In review [email protected] 4 participants 8 messages Mar 21, 2017 – Apr 12, 2017 Kbuild

lore
Share & tools
lore
#0 lore raw

v2 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 and release them using the BSD license.
The other non intel UCM files can be moved over when there is agreement with the file authors, but in the mean time they will stay in alsa-lib.
The configs are moved from alsa-lib repo. The original authorship and commit message of all config files will be reserved.

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                       |  12 ++++
 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, 504 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
#1 lore raw

PATCH v2 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.

---
 .gitignore   | 12 ++++++++++++
 ChangeLog    |  1 +
 INSTALL      |  1 +
 Makefile.am  |  1 +
 configure.ac | 22 ++++++++++++++++++++++
 gitcompile   |  5 +++++
 6 files changed, 42 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 ChangeLog
 create mode 120000 INSTALL
 create mode 100644 Makefile.am
 create mode 100644 configure.ac
 create mode 100755 gitcompile
.gitignore new file +12 -0
new file mode 100644
index 0000000..acbc113
@@ -0,0 +1,12 @@
+aclocal.m4
+AUTHORS
+autom4te.cache
+autoscan.log
+config.log
+config.status
+configure
+install-sh
+Makefile
+Makefile.in
+missing
+NEWS
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..0723060
@@ -0,0 +1,22 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.69])
+AC_INIT(alsa-ucm-conf, 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"
+test "x$prefix" != xNONE && ALSA_CONFIG_DIR=$prefix
+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
#2 lore raw

PATCH v2 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.

---
 Makefile.am                      |   2 +-
 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                     |   3 +-
 7 files changed, 230 insertions(+), 2 deletions(-)
 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
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 0723060..c797f58 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"
 test "x$prefix" != xNONE && ALSA_CONFIG_DIR=$prefix
Signature · 1 line
2.7.4
#3 lore raw

PATCH v2 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.

---
 Makefile.am                      |   2 +-
 configure.ac                     |   3 +-
 skylake-rt286/Hdmi1              |  20 ++++++
 skylake-rt286/Hdmi2              |  20 ++++++
 skylake-rt286/HiFi               | 129 +++++++++++++++++++++++++++++++++++++++
 skylake-rt286/Makefile.am        |   4 ++
 skylake-rt286/skylake-rt286.conf |  60 ++++++++++++++++++
 7 files changed, 236 insertions(+), 2 deletions(-)
 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
Makefile.am +1 -1
index 5f86692..f351b75 100644
@@ -1 +1 @@
-SUBDIRS=broxton-rt298
+SUBDIRS=broxton-rt298 skylake-rt286
configure.ac +2 -1
index c797f58..2503641 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"
 test "x$prefix" != xNONE && ALSA_CONFIG_DIR=$prefix
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
#4 lore raw
In reply to [email protected]
Quoted 4 lines · On Wed, 2017-04-12 at 16:54 +0800, [email protected] wrote:

From: Fuwei Tang <[email protected]>

Add the intel UCM configs to a dedicated UCM conf repo and release them using the BSD license.

We are still missing the LICENSE/COPYING file. We need to add it the top directory level so it's clear to users.

Quoted 5 lines

The other non intel UCM files can be moved over when there is agreement with the file authors, but in the mean time they will stay in alsa-lib.
The configs are moved from alsa-lib repo. The original authorship and commit message of all config files will be reserved.

Takashi, how do you want to manage the move ? We could add the files to the new repo first and then only delete them in alsa-lib after the next alsa-lib release ? This would give time for distros to pick up the new conf package. I'm easy on whatever works best here.

Thanks

Liam

Quoted 41 lines

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                       |  12 ++++
 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, 504 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
#5 lore raw
Quoted 16 lines · Liam Girdwood
Quoted 4 lines · On Wed, 2017-04-12 at 16:54 +0800, [email protected] wrote:

From: Fuwei Tang <[email protected]>

Add the intel UCM configs to a dedicated UCM conf repo and release them using the BSD license.

We are still missing the LICENSE/COPYING file. We need to add it the top directory level so it's clear to users.

Quoted 5 lines

The other non intel UCM files can be moved over when there is agreement with the file authors, but in the mean time they will stay in alsa-lib.
The configs are moved from alsa-lib repo. The original authorship and commit message of all config files will be reserved.

Quoted 4 lines

Takashi, how do you want to manage the move ? We could add the files to the new repo first and then only delete them in alsa-lib after the next alsa-lib release ? This would give time for distros to pick up the new conf package. I'm easy on whatever works best here.

We really need a consensus before dealing with such patches. It's just a copy / move of some files to another repo, so a patch is just a waste of bandwidth.

If the only question is about the license, why can't we put another license to UCM profiles in the repo, while keeping LGPL for others as is? You can declare it in README or maybe better in another text file to explaining about the licenses in the repository.

I'm asking it because, possibly, UCM syntax may be extended in future, and then there is mismatch with UCM profile and parser. By providing in a single repo, at least, we can avoid the mismatch in the source level.

Other than that, I myself have no objection to factor out to another repo. But, as previously mentioned, it's rather a request to Jaroslav, who maintains the repositories in alsa-project.org.

thanks,

Takashi

#6 lore raw

Dne 12.4.2017 v 16:57 Takashi Iwai napsal(a):

Quoted 32 lines
Quoted 16 lines · Liam Girdwood
Quoted 4 lines · On Wed, 2017-04-12 at 16:54 +0800, [email protected] wrote:

From: Fuwei Tang <[email protected]>

Add the intel UCM configs to a dedicated UCM conf repo and release them using the BSD license.

We are still missing the LICENSE/COPYING file. We need to add it the top directory level so it's clear to users.

Quoted 5 lines

The other non intel UCM files can be moved over when there is agreement with the file authors, but in the mean time they will stay in alsa-lib.
The configs are moved from alsa-lib repo. The original authorship and commit message of all config files will be reserved.

Quoted 4 lines

Takashi, how do you want to manage the move ? We could add the files to the new repo first and then only delete them in alsa-lib after the next alsa-lib release ? This would give time for distros to pick up the new conf package. I'm easy on whatever works best here.

We really need a consensus before dealing with such patches. It's just a copy / move of some files to another repo, so a patch is just a waste of bandwidth.

If the only question is about the license, why can't we put another license to UCM profiles in the repo, while keeping LGPL for others as is? You can declare it in README or maybe better in another text file to explaining about the licenses in the repository.

Quoted 8 lines

I'm asking it because, possibly, UCM syntax may be extended in future, and then there is mismatch with UCM profile and parser. By providing in a single repo, at least, we can avoid the mismatch in the source level.

Other than that, I myself have no objection to factor out to another repo. But, as previously mentioned, it's rather a request to Jaroslav, who maintains the repositories in alsa-project.org.

I'm ready to do anything we settle. There's another option - keep ucm config files in alsa-lib and publish/mirror them also in the separate repository (assuming that there are other frameworks which may use them
- like on android). And I agree with the point that the UCM files may have different licence than other files in alsa-lib, because they are not a direct part of the executable binary.

Jaroslav

Signature · 2 lines
Jaroslav Kysela <[email protected]>
Linux Sound Maintainer; ALSA Project; Red Hat, Inc.
#7 lore raw
Quoted 42 lines · Jaroslav Kysela

Dne 12.4.2017 v 16:57 Takashi Iwai napsal(a):

Quoted 32 lines
Quoted 16 lines · Liam Girdwood
Quoted 4 lines · On Wed, 2017-04-12 at 16:54 +0800, [email protected] wrote:

From: Fuwei Tang <[email protected]>

Add the intel UCM configs to a dedicated UCM conf repo and release them using the BSD license.

We are still missing the LICENSE/COPYING file. We need to add it the top directory level so it's clear to users.

Quoted 5 lines

The other non intel UCM files can be moved over when there is agreement with the file authors, but in the mean time they will stay in alsa-lib.
The configs are moved from alsa-lib repo. The original authorship and commit message of all config files will be reserved.

Quoted 4 lines

Takashi, how do you want to manage the move ? We could add the files to the new repo first and then only delete them in alsa-lib after the next alsa-lib release ? This would give time for distros to pick up the new conf package. I'm easy on whatever works best here.

We really need a consensus before dealing with such patches. It's just a copy / move of some files to another repo, so a patch is just a waste of bandwidth.

If the only question is about the license, why can't we put another license to UCM profiles in the repo, while keeping LGPL for others as is? You can declare it in README or maybe better in another text file to explaining about the licenses in the repository.

Quoted 8 lines

I'm asking it because, possibly, UCM syntax may be extended in future, and then there is mismatch with UCM profile and parser. By providing in a single repo, at least, we can avoid the mismatch in the source level.

Other than that, I myself have no objection to factor out to another repo. But, as previously mentioned, it's rather a request to Jaroslav, who maintains the repositories in alsa-project.org.

Quoted 7 lines

I'm ready to do anything we settle. There's another option - keep ucm config files in alsa-lib and publish/mirror them also in the separate repository (assuming that there are other frameworks which may use them
- like on android). And I agree with the point that the UCM files may have different licence than other files in alsa-lib, because they are not a direct part of the executable binary.

OK, that would be fine with me. Having the mirror would make sense. How would you propose we work the mirror ?

Fwiw, we are also considering adding a tool that converts UCM to/from Parameter Framework XML (used on IA Android) and tinyHAL from Cirrus. This would give us a generic configuration repo that could be deployed on Android, Chrome and Linux and somewhere that the codec vendors could send common codec configuration sequences (now that UCM supports C like include/define concepts).

Thanks

Liam

Quoted 2 lines

Jaroslav