mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

conf/ucm: ROCKCHIP-I2S: rename to VEYRON-I2S

Browse source 
Commit a192f52fc6 introduced an ucm profile for Rockchip Veyron-
Chromebooks by taking the ucm profile from the ChromeOS userspace.

But similarly to DAISY-I2S, PAZ00 and most other profiles, the audio
setup is pretty specific to a board type, so hogging the Rockchip name
will make it harder for future Rockchip based boards to fit in nicely.

And while Veyron also is a family of boards, all of them share the
same audio setup. The ucm profile was not released with any official
alsa release and the audio setup also isn't in the mainline kernel yet,
so such a rename should be easily possible.

Fixes: a192f52fc6 ("conf/ucm: ROCKCHIP-I2S: add Rockchip I2S UCM config.")
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Heiko Stübner 2016-06-09 01:17:15 +02:00 • committed by Takashi Iwai
parent d39e1879b9
commit f449a29943
6 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -658,7 +658,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
src/conf/ucm/PAZ00/Makefile \
src/conf/ucm/GoogleNyan/Makefile \
src/conf/ucm/broadwell-rt286/Makefile \
src/conf/ucm/ROCKCHIP-I2S/Makefile \
src/conf/ucm/VEYRON-I2S/Makefile \
src/conf/topology/Makefile \
src/conf/topology/broadwell/Makefile \
modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \

2
src/conf/ucm/Makefile.am
View file

@ -1 +1 @@
SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 ROCKCHIP-I2S
SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 VEYRON-I2S

4
src/conf/ucm/ROCKCHIP-I2S/Makefile.am
View file

@ -1,4 +0,0 @@
alsaconfigdir = @ALSA_CONFIG_DIR@
ucmdir = $(alsaconfigdir)/ucm/ROCKCHIP-I2S
ucm_DATA = ROCKCHIP-I2S.conf HiFi.conf
EXTRA_DIST = $(ucm_DATA)

14
src/conf/ucm/ROCKCHIP-I2S/HiFi.conf → src/conf/ucm/VEYRON-I2S/HiFi.conf
View file

@ -5,7 +5,7 @@ SectionVerb {
}
EnableSequence [
cdev "hw:ROCKCHIPI2S"
cdev "hw:VEYRONI2S"
cset "name='Left Speaker Mixer Left DAC Switch' on"
cset "name='Right Speaker Mixer Right DAC Switch' on"
@ -49,19 +49,19 @@ SectionVerb {
SectionDevice."Headphone".0 {
Value {
JackName "ROCKCHIP-I2S Headset Jack"
JackName "VEYRON-I2S Headset Jack"
OutputDspName ""
}
EnableSequence [
cdev "hw:ROCKCHIPI2S"
cdev "hw:VEYRONI2S"
cset "name='Speaker Switch' off"
cset "name='Headphone Left Switch' on"
cset "name='Headphone Right Switch' on"
]
DisableSequence [
cdev "hw:ROCKCHIPI2S"
cdev "hw:VEYRONI2S"
cset "name='Headphone Left Switch' off"
cset "name='Headphone Right Switch' off"
@ -71,11 +71,11 @@ SectionDevice."Headphone".0 {
SectionDevice."Mic".0 {
Value {
JackName "ROCKCHIP-I2S Headset Jack"
JackName "VEYRON-I2S Headset Jack"
}
EnableSequence [
cdev "hw:ROCKCHIPI2S"
cdev "hw:VEYRONI2S"
cset "name='Int Mic Switch' off"
cset "name='DMIC Mux' ADC"
@ -84,7 +84,7 @@ SectionDevice."Mic".0 {
]
DisableSequence [
cdev "hw:ROCKCHIPI2S"
cdev "hw:VEYRONI2S"
cset "name='Headset Mic Switch' off"
cset "name='DMIC Mux' DMIC"

4
src/conf/ucm/VEYRON-I2S/Makefile.am Normal file
View file

@ -0,0 +1,4 @@
alsaconfigdir = @ALSA_CONFIG_DIR@
ucmdir = $(alsaconfigdir)/ucm/VEYRON-I2S
ucm_DATA = VEYRON-I2S.conf HiFi.conf
EXTRA_DIST = $(ucm_DATA)

2
src/conf/ucm/ROCKCHIP-I2S/ROCKCHIP-I2S.conf → src/conf/ucm/VEYRON-I2S/VEYRON-I2S.conf
View file

@ -1,4 +1,4 @@
Comment "Rockchip card"
Comment "Rockchip Veyron card"
SectionUseCase."HiFi" {
File "HiFi.conf"