[alsa-devel] [PATCH v2 0/3] ucm-conf: Add intel UCM conf files to alsa-ucm-conf repo
From: Fuwei Tang fuweix.tang@intel.com
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
From: Fuwei Tang fuweix.tang@intel.com
This add autoconf and automake script and Makefile.am for conf files to be installed automatically.
Signed-off-by: Fuwei Tang fuweix.tang@intel.com --- .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
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..acbc113 --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +aclocal.m4 +AUTHORS +autom4te.cache +autoscan.log +config.log +config.status +configure +install-sh +Makefile +Makefile.in +missing +NEWS diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..2a8eb65 --- /dev/null +++ b/ChangeLog @@ -0,0 +1 @@ +Move all conf files to alsa-ucm-conf repo from alsa-lib repo. diff --git a/INSTALL b/INSTALL new file mode 120000 index 0000000..ddcdb76 --- /dev/null +++ b/INSTALL @@ -0,0 +1 @@ +/usr/share/automake-1.15/INSTALL \ No newline at end of file diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..e2baa04 --- /dev/null +++ b/Makefile.am @@ -0,0 +1 @@ +SUBDIRS= diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..0723060 --- /dev/null +++ b/configure.ac @@ -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 diff --git a/gitcompile b/gitcompile new file mode 100755 index 0000000..fff6769 --- /dev/null +++ b/gitcompile @@ -0,0 +1,5 @@ +#!/bin/bash + +aclocal +autoconf +automake --add-missing
From: Vinod Koul vinod.koul@intel.com
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 vinod.koul@intel.com. Original authorship is retained.
Signed-off-by: Nishit Sharma nishitx.sharma@intel.com Signed-off-by: G Kranthi gudishax.kranthikumar@intel.com Signed-off-by: Vinod Koul vinod.koul@intel.com Signed-off-by: Fuwei Tang fuweix.tang@intel.com --- 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
diff --git a/Makefile.am b/Makefile.am index e2baa04..5f86692 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1 @@ -SUBDIRS= +SUBDIRS=broxton-rt298 diff --git a/broxton-rt298/Hdmi1 b/broxton-rt298/Hdmi1 new file mode 100644 index 0000000..48514f4 --- /dev/null +++ b/broxton-rt298/Hdmi1 @@ -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" + } +} + diff --git a/broxton-rt298/Hdmi2 b/broxton-rt298/Hdmi2 new file mode 100644 index 0000000..764f8b9 --- /dev/null +++ b/broxton-rt298/Hdmi2 @@ -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" + } +} + diff --git a/broxton-rt298/HiFi b/broxton-rt298/HiFi new file mode 100644 index 0000000..2e2d6fe --- /dev/null +++ b/broxton-rt298/HiFi @@ -0,0 +1,129 @@ +# Usecase for stereo playback Speaker and Headset, Recording on DMIC and Headset MIC. +# For Audio in I2S mode on Intel Broxton platforms + +SectionVerb { + + EnableSequence [ + cdev "hw:broxtonrt298" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + ] + + DisableSequence [ + cdev "hw:broxtonrt298" + ] + + Value { + TQ "HiFi" + CapturePCM "hw:broxtonrt298,1" + PlaybackPCM "hw:broxtonrt298,0" + } +} + +SectionDevice."dmiccap" { + Comment "DMIC Stereo" + + ConflictingDevice [ + "Headset" + ] + + EnableSequence [ + + cdev "hw:broxtonrt298" + exec "echo broxtonrt298 dmiccap called" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo codec0_in mi Switch' 0" + cset "name='Mic Jack Switch' 0" + + ] + + DisableSequence [ + cdev "hw:broxtonrt298" + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" + cset "name='Mic Jack Switch' 1" + cset "name='ADC 0 Mux' 0" + ] + Value { + CaptureChannels "2" + CapturePriority "2" + } +} + +SectionDevice."Headphones" { + Comment "Headphones" + + ConflictingDevice [ + "Speaker" + ] + EnableSequence [ + cdev "hw:broxtonrt298" + exec "echo broxtonrt298 Headphone called" + cset "name='HPO L Switch' 1" + cset "name='HPO R Switch' 1" + cset "name='Headphone Jack Switch' 1" + cset "name='Speaker Playback Switch' 0,0" + ] + + DisableSequence [ + cdev "hw:broxtonrt298" + ] + Value { + PlaybackChannels "2" + PlaybackPriority "1" + JackControl "Headphone Jack" + JackHWMute "Speaker" + } +} + +SectionDevice."Speaker" { + Comment "Speaker" + + ConflictingDevice [ + "Headphones" + ] + EnableSequence [ + cdev "hw:broxtonrt298" + exec "echo broxtonrt298 speaker called" + cset "name='SPO Switch' 1" + cset "name='Speaker Playback Switch' 1,1" + cset "name='Speaker Switch' 1" + cset "name='HPO L Switch' 0" + cset "name='HPO R Switch' 0" + ] + + DisableSequence [ + ] + Value { + PlaybackChannels "2" + PlaybackPriority "1" + JackHWMute "Headphones" + } +} + +SectionDevice."Headset" { + Comment "Headset Mic" + + ConflictingDevice [ + "dmiccap" + ] + EnableSequence [ + cdev "hw:broxtonrt298" + exec "echo broxtonrt298 Headset called" + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='ADC0 Capture Volume' 105,105" + cset "name='ADC 0 Mux' 0" + cset "name='Mic Jack Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" + ] + + DisableSequence [ + cdev "hw:broxtonrt298" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo codec0_in mi Switch' 0" + ] + Value { + CaptureChannels "2" + CapturePriority "2" + JackControl "Mic Jack" + } +} diff --git a/broxton-rt298/Makefile.am b/broxton-rt298/Makefile.am new file mode 100644 index 0000000..80f480e --- /dev/null +++ b/broxton-rt298/Makefile.am @@ -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) diff --git a/broxton-rt298/broxton-rt298.conf b/broxton-rt298/broxton-rt298.conf new file mode 100644 index 0000000..3f3d0be --- /dev/null +++ b/broxton-rt298/broxton-rt298.conf @@ -0,0 +1,58 @@ +# UCM for Intel Broxton platforms +# For Audio in I2S mode + +SectionUseCase."HiFi" { + File "HiFi" + Comment "Play and record HiFi quality Music" +} + +SectionUseCase."Hdmi1" { + File "Hdmi1" + Comment "Play on Hdmi/DP 1" +} + +SectionUseCase."Hdmi2" { + File "Hdmi2" + Comment "Play on Hdmi/DP 2" +} + +ValueDefaults { + PlaybackCTL "hw:broxtonrt298" + CaptureCTL "hw:broxtonrt298" + CaptureChannels "2" + CapturePriority "2" +} + +SectionDefaults [ + cdev "hw:broxtonrt298" + exec "echo broxtonrt298 CONF Defaults" + cset "name='Headphone Jack Switch' 1" + cset "name='Speaker Switch' 1" + cset "name='Speaker Playback Switch' 0,0" + cset "name='Front DAC Switch' 1" + cset "name='Front RECMIX Switch' 0" + cset "name='Mic Jack Switch' 1" + cset "name='ADC 0 Mux' 2" + cset "name='ADC 1 Mux' 0" + cset "name='DAC0 Playback Volume' 100,100" + cset "name='HPO L Switch' 0" + cset "name='HPO Mux' 0" + cset "name='HPO R Switch' 0" + cset "name='Pin 5 Mux' 1" + cset "name='Pin 6 Mux' 2" + cset "name='Pin 7 Mux' 3" + cset "name='RECMIX Beep Switch' 0" + cset "name='RECMIX Line1 Switch' 0" + cset "name='RECMIX Mic1 Switch' 0" + cset "name='SPK Mux' 0" + cset "name='SPO Switch' 1" + cset "name='codec0_out mo codec0_in mi Switch' 0" + cset "name='codec0_out mo dmic01_hifi_in mi Switch' 0" + cset "name='codec0_out mo media0_in mi Switch' 1" + cset "name='codec1_out mo codec0_in mi Switch' 0" + cset "name='codec1_out mo dmic01_hifi_in mi Switch' 0" + cset "name='codec1_out mo media0_in mi Switch' 0" + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo media0_in mi Switch' 0" +] diff --git a/configure.ac b/configure.ac index 0723060..c797f58 100644 --- a/configure.ac +++ b/configure.ac @@ -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
From: Vinod Koul vinod.koul@intel.com
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 vinod.koul@intel.com. Original authorship is retained.
Signed-off-by: Karthik D M karthik.d.m@intel.com Signed-off-by: Nishit Sharma nishitx.sharma@intel.com Signed-off-by: Jeeja KP jeeja.kp@intel.com Signed-off-by: Vinod Koul vinod.koul@intel.com Signed-off-by: Fuwei Tang fuweix.tang@intel.com --- 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
diff --git a/Makefile.am b/Makefile.am index 5f86692..f351b75 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1 @@ -SUBDIRS=broxton-rt298 +SUBDIRS=broxton-rt298 skylake-rt286 diff --git a/configure.ac b/configure.ac index c797f58..2503641 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/skylake-rt286/Hdmi1 b/skylake-rt286/Hdmi1 new file mode 100644 index 0000000..0e00fc8 --- /dev/null +++ b/skylake-rt286/Hdmi1 @@ -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" + } +} + diff --git a/skylake-rt286/Hdmi2 b/skylake-rt286/Hdmi2 new file mode 100644 index 0000000..89b31aa --- /dev/null +++ b/skylake-rt286/Hdmi2 @@ -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" + } +} + diff --git a/skylake-rt286/HiFi b/skylake-rt286/HiFi new file mode 100644 index 0000000..5f403db --- /dev/null +++ b/skylake-rt286/HiFi @@ -0,0 +1,129 @@ +# Usecase for stereo playback Speaker and Headset, Recording on DMIC and Headset MIC. +# For Audio in I2S mode on Intel SKYLAKE/KABYLAKE platforms + +SectionVerb { + + EnableSequence [ + cdev "hw:skylakert286" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + ] + + DisableSequence [ + cdev "hw:skylakert286" + ] + + Value { + TQ "HiFi" + CapturePCM "hw:skylakert286,1" + PlaybackPCM "hw:skylakert286,0" + } +} + +SectionDevice."Headphones" { + Comment "Headphones" + + ConflictingDevice [ + "Speaker" + ] + EnableSequence [ + cdev "hw:skylakert286" + cset "name='HPO L Switch' 1" + cset "name='HPO R Switch' 1" + cset "name='Headphone Jack Switch' 1" + cset "name='Speaker Playback Switch' 0,0" + ] + + DisableSequence [ + ] + Value { + PlaybackChannels "2" + PlaybackPriority "1" + JackControl "Headphone Jack" + JackHWMute "Speaker" + } +} + +SectionDevice."Speaker" { + Comment "Speaker" + + ConflictingDevice [ + "Headphones" + ] + EnableSequence [ + cdev "hw:skylakert286" + cset "name='SPO Switch' 1" + cset "name='Speaker Playback Switch' 1,1" + cset "name='Speaker Switch' 1" + cset "name='HPO L Switch' 0" + cset "name='HPO R Switch' 0" + ] + + DisableSequence [ + ] + Value { + PlaybackChannels "2" + PlaybackPriority "1" + JackHWMute "Headphones" + } +} + +SectionDevice."Headset" { + Comment "Headset Mic" + + ConflictingDevice [ + "dmiccap" + ] + EnableSequence [ + cdev "hw:skylakert286" + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='ADC0 Capture Switch' 1,1" + cset "name='ADC 0 Mux' 0" + cset "name='Mic Jack Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" + ] + + DisableSequence [ + cdev "hw:skylakert286" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo codec0_in mi Switch' 0" + ] + Value { + CaptureChannels "2" + CapturePriority "2" + JackControl "Mic Jack" + } +} + + +SectionDevice."dmiccap" { + Comment "DMIC Stereo" + + ConflictingDevice [ + "Headpset" + ] + + EnableSequence [ + + cdev "hw:skylakert286" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo codec0_in mi Switch' 0" + cset "name='ADC0 Capture Switch' 0,0" + cset "name='Mic Jack Switch' 0" + cset "name='ADC 0 Mux' 0" + + ] + + DisableSequence [ + cdev "hw:skylakert286" + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" + cset "name='ADC0 Capture Switch' 1,1" + cset "name='Mic Jack Switch' 1" + cset "name='ADC 0 Mux' 2" + ] + Value { + CaptureChannels "2" + CapturePriority "2" + } +} + diff --git a/skylake-rt286/Makefile.am b/skylake-rt286/Makefile.am new file mode 100644 index 0000000..9d6a85a --- /dev/null +++ b/skylake-rt286/Makefile.am @@ -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) diff --git a/skylake-rt286/skylake-rt286.conf b/skylake-rt286/skylake-rt286.conf new file mode 100644 index 0000000..2a74744 --- /dev/null +++ b/skylake-rt286/skylake-rt286.conf @@ -0,0 +1,60 @@ +# UCM for Intel SKYLAKE/KABYLAKE platforms +# For Audio in I2S mode + +SectionUseCase."HiFi" { + File "HiFi" + Comment "Play and record HiFi quality Music" +} + +SectionUseCase."Hdmi1" { + File "Hdmi1" + Comment "Play on Hdmi/DP 1" +} + +SectionUseCase."Hdmi2" { + File "Hdmi2" + Comment "Play on Hdmi/DP 2" +} + +ValueDefaults { + PlaybackCTL "hw:skylakert286" + CaptureCTL "hw:skylakert286" + CaptureChannels "2" + CapturePriority "2" +} + +SectionDefaults [ + cdev "hw:skylakert286" + cset "name='Headphone Jack Switch' 1" + cset "name='Speaker Switch' 1" + cset "name='Speaker Playback Switch' 0,0" + cset "name='Front DAC Switch' 1" + cset "name='Front RECMIX Switch' 0" + cset "name='Mic Jack Switch' 1" + cset "name='ADC 0 Mux' 2" + cset "name='ADC 1 Mux' 0" + cset "name='ADC0 Capture Volume' 105,105" + cset "name='ADC0 Capture Switch' 1,1" + cset "name='AMIC Volume' 3" + cset "name='DAC0 Playback Volume' 100,100" + cset "name='HPO L Switch' 0" + cset "name='HPO Mux' 0" + cset "name='HPO R Switch' 0" + cset "name='Pin 5 Mux' 1" + cset "name='Pin 6 Mux' 2" + cset "name='Pin 7 Mux' 3" + cset "name='RECMIX Beep Switch' 0" + cset "name='RECMIX Line1 Switch' 0" + cset "name='RECMIX Mic1 Switch' 0" + cset "name='SPK Mux' 0" + cset "name='SPO Switch' 1" + cset "name='codec0_out mo codec0_in mi Switch' 0" + cset "name='codec0_out mo dmic01_hifi_in mi Switch' 0" + cset "name='codec0_out mo media0_in mi Switch' 1" + cset "name='codec1_out mo codec0_in mi Switch' 0" + cset "name='codec1_out mo dmic01_hifi_in mi Switch' 0" + cset "name='codec1_out mo media0_in mi Switch' 0" + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo media0_in mi Switch' 0" +]
On Wed, 2017-04-12 at 16:54 +0800, fuweix.tang@intel.com wrote:
From: Fuwei Tang fuweix.tang@intel.com
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.
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
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
On Wed, 12 Apr 2017 16:50:57 +0200, Liam Girdwood wrote:
On Wed, 2017-04-12 at 16:54 +0800, fuweix.tang@intel.com wrote:
From: Fuwei Tang fuweix.tang@intel.com
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.
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.
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
Dne 12.4.2017 v 16:57 Takashi Iwai napsal(a):
On Wed, 12 Apr 2017 16:50:57 +0200, Liam Girdwood wrote:
On Wed, 2017-04-12 at 16:54 +0800, fuweix.tang@intel.com wrote:
From: Fuwei Tang fuweix.tang@intel.com
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.
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.
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.
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
On Wed, 2017-04-12 at 17:10 +0200, Jaroslav Kysela wrote:
Dne 12.4.2017 v 16:57 Takashi Iwai napsal(a):
On Wed, 12 Apr 2017 16:50:57 +0200, Liam Girdwood wrote:
On Wed, 2017-04-12 at 16:54 +0800, fuweix.tang@intel.com wrote:
From: Fuwei Tang fuweix.tang@intel.com
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.
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.
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.
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
Jaroslav
participants (4)
-
fuweix.tang＠intel.com -
Jaroslav Kysela -
Liam Girdwood -
Takashi Iwai