From: Heiko Stübner Date: Wed, 8 Jun 2016 23:17:15 +0000 (+0200) Subject: conf/ucm: ROCKCHIP-I2S: rename to VEYRON-I2S X-Git-Tag: v1.2.1~107 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=f373070a023c318556a881377e844262cc89a523;p=alsa-ucm-conf.git conf/ucm: ROCKCHIP-I2S: rename to VEYRON-I2S Commit a192f52fc63a 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: a192f52fc63a ("conf/ucm: ROCKCHIP-I2S: add Rockchip I2S UCM config.") Signed-off-by: Heiko Stuebner Signed-off-by: Takashi Iwai --- diff --git a/ucm/ROCKCHIP-I2S/HiFi.conf b/ucm/VEYRON-I2S/HiFi.conf similarity index 91% rename from ucm/ROCKCHIP-I2S/HiFi.conf rename to ucm/VEYRON-I2S/HiFi.conf index 7bfe995..292b8fc 100644 --- a/ucm/ROCKCHIP-I2S/HiFi.conf +++ b/ucm/VEYRON-I2S/HiFi.conf @@ -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" diff --git a/ucm/ROCKCHIP-I2S/ROCKCHIP-I2S.conf b/ucm/VEYRON-I2S/VEYRON-I2S.conf similarity index 67% rename from ucm/ROCKCHIP-I2S/ROCKCHIP-I2S.conf rename to ucm/VEYRON-I2S/VEYRON-I2S.conf index 0c399b0..2a92b6f 100644 --- a/ucm/ROCKCHIP-I2S/ROCKCHIP-I2S.conf +++ b/ucm/VEYRON-I2S/VEYRON-I2S.conf @@ -1,4 +1,4 @@ -Comment "Rockchip card" +Comment "Rockchip Veyron card" SectionUseCase."HiFi" { File "HiFi.conf"