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 <heiko@sntech.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

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 7bfe995900e9297c46048b4ea3235fa2c8d042c9..292b8fcacdd8776d129beb6f3586422791b2dd63 100644 (file)
--- 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 0c399b0d2bad2face59cec4afd70134e1d6c5425..2a92b6f56702728bc512511a6d8e2957a67f2281 100644 (file)
--- 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"