SOF/HDA/SKL UCM: rename from sof-skl_hda_card to sof-hda-dsp

Follow the kernel change and rename everything to more clear
sof-hda-dsp.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/HiFi.conf b/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/HiFi.conf
index b08c0e56cdc623c40fb07eaa16f6ea9f1a7846b2..92c531f625ba66cfeb388129c64ed3dc141f008b 100644 (file)
--- a/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/HiFi.conf
+++ b/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/HiFi.conf
@@ -1,23 +1,25 @@
 # Use case Configuration for ThinkPad X1 Carbon 7th
 
-<sof-skl_hda_card/HiFi.conf>
+<sof-hda-dsp/HiFi.conf>
 
 SectionDevice."Bass Speaker" {
        Comment "Bass Speaker"
 
        EnableSequence [
-               cdev "hw:sofsklhdacard"
+               cdev "hw:sofhdadsp"
                cset "name='Bass Speaker Playback Switch' on"
                cset "name='Speaker Playback Switch' on"
                cset "name='Speaker Playback Volume' 80"
        ]
 
        DisableSequence [
+               cdev "hw:sofhdadsp"
                cset "name='Speaker Playback Switch' off"
                cset "name='Bass Speaker Playback Switch' off"
        ]
+
        Value {
-               PlaybackPCM "hw:sofsklhdacard,0"
+               PlaybackPCM "hw:sofhdadsp,0"
                JackHWMute "Headphone"
                PlaybackChannels "2"
        }

diff --git a/ucm/sof-skl_hda_card/Hdmi.conf b/ucm/sof-hda-dsp/Hdmi.conf
similarity index 72%
rename from ucm/sof-skl_hda_card/Hdmi.conf
rename to ucm/sof-hda-dsp/Hdmi.conf
index 38e28514eafbe4f610365e32698e5edbed31182b..bbbb42f0ebc9a3018fc68d5d11bb4d26df6642be 100644 (file)
--- a/ucm/sof-skl_hda_card/Hdmi.conf
+++ b/ucm/sof-hda-dsp/Hdmi.conf
@@ -1,15 +1,15 @@
-# Use case Configuration for skl-hda-card
+# Use case Configuration for sof-hda-dsp
 
 SectionVerb {
 
        EnableSequence [
-               cdev "hw:sofsklhdacard"
+               cdev "hw:sofhdadsp"
                cset "name='Master Playback Switch' on"
                cset "name='Capture Switch' on"
        ]
 
        DisableSequence [
-               cdev "hw:sofsklhdacard"
+               cdev "hw:sofhdadsp"
        ]
 }
 
@@ -17,17 +17,17 @@ SectionDevice."HDMI1" {
        Comment "HDMI1/DP1 Output"
 
        EnableSequence [
-               cdev "hw:sofsklhdacard"
+               cdev "hw:sofhdadsp"
                cset "name='IEC958 Playback Switch' on"
        ]
 
        DisableSequence [
-               cdev "hw:sofsklhdacard"
+               cdev "hw:sofhdadsp"
                cset "name='IEC958 Playback Switch' off"
        ]
 
        Value {
-               PlaybackPCM "hw:sofsklhdacard,3"
+               PlaybackPCM "hw:sofhdadsp,3"
                PlaybackChannels "2"
                JackControl "HDMI/DP,pcm=3 Jack"
        }
@@ -37,17 +37,17 @@ SectionDevice."HDMI2" {
        Comment "HDMI2/DP2 Output"
 
        EnableSequence [
-               cdev "hw:sofsklhdacard"
+               cdev "hw:sofhdadsp"
                cset "name='IEC958 Playback Switch',index=1 on"
        ]
 
        DisableSequence [
-               cdev "hw:sofsklhdacard"
+               cdev "hw:sofhdadsp"
                cset "name='IEC958 Playback Switch',index=1 off"
        ]
 
        Value {
-               PlaybackPCM "hw:sofsklhdacard,4"
+               PlaybackPCM "hw:sofhdadsp,4"
                PlaybackChannels "2"
                JackControl "HDMI/DP,pcm=4 Jack"
        }
@@ -57,17 +57,17 @@ SectionDevice."HDMI3" {
        Comment "HDMI3/DP3 Output"
 
        EnableSequence [
-               cdev "hw:sofsklhdacard"
+               cdev "hw:sofhdadsp"
                cset "name='IEC958 Playback Switch',index=2 on"
        ]
 
        DisableSequence [
-               cdev "hw:sofsklhdacard"
+               cdev "hw:sofhdadsp"
                cset "name='IEC958 Playback Switch',index=2 off"
        ]
 
        Value {
-               PlaybackPCM "hw:sofsklhdacard,5"
+               PlaybackPCM "hw:sofhdadsp,5"
                PlaybackChannels "2"
                JackControl "HDMI/DP,pcm=5 Jack"
        }

diff --git a/ucm/sof-skl_hda_card/HiFi.conf b/ucm/sof-hda-dsp/HiFi.conf
similarity index 76%
rename from ucm/sof-skl_hda_card/HiFi.conf
rename to ucm/sof-hda-dsp/HiFi.conf
index 37ea1a3bac2262b4b5795f7fab7251b66ddb1c9e..be38477c6ad9e58fb9ec194029aec454b7e38c96 100644 (file)
--- a/ucm/sof-skl_hda_card/HiFi.conf
+++ b/ucm/sof-hda-dsp/HiFi.conf
@@ -1,15 +1,15 @@
-# Use case Configuration for skl-hda-card
+# Use case Configuration for sof-hda-dsp
 
 SectionVerb {
 
        EnableSequence [
-               cdev "hw:sofsklhdacard"
+               cdev "hw:sofhdadsp"
                cset "name='Master Playback Switch' on"
                cset "name='Capture Switch' on"
        ]
 
        DisableSequence [
-               cdev "hw:sofsklhdacard"
+               cdev "hw:sofhdadsp"
        ]
 }
 
@@ -17,21 +17,21 @@ SectionDevice."Headphone" {
        Comment "Headphone"
 
        EnableSequence [
-               cdev "hw:sofsklhdacard"
+               cdev "hw:sofhdadsp"
                cset "name='Headphone Playback Switch' on"
        ]
 
        DisableSequence [
-               cdev "hw:sofsklhdacard"
+               cdev "hw:sofhdadsp"
                cset "name='Headphone Playback Switch' off"
        ]
 
        Value {
-               PlaybackPCM "hw:sofsklhdacard,0"
+               PlaybackPCM "hw:sofhdadsp,0"
                PlaybackVolume "Headphone"
                PlaybackSwitch "Headphone Playback Switch"
                PlaybackChannels "2"
-               JackName "sof-skl_hda_card Headphone"
+               JackName "sof-hda-dsp Headphone"
                JackType "gpio"
                JackSwitch "12"
                JackControl "Headphone Jack"
@@ -42,17 +42,17 @@ SectionDevice."Speaker" {
        Comment "Speaker"
 
        EnableSequence [
-               cdev "hw:sofsklhdacard"
+               cdev "hw:sofhdadsp"
                cset "name='Speaker Playback Switch' on"
        ]
 
        DisableSequence [
-               cdev "hw:sofsklhdacard"
+               cdev "hw:sofhdadsp"
                cset "name='Speaker Playback Switch' off"
        ]
 
        Value {
-               PlaybackPCM "hw:sofsklhdacard,0"
+               PlaybackPCM "hw:sofhdadsp,0"
                PlaybackVolume "Speaker"
                PlaybackSwitch "Speaker Playback Switch"
                JackHWMute "Headphone"
@@ -68,11 +68,11 @@ SectionDevice."Headset" {
        ]
 
        EnableSequence [
-               cdev "hw:sofsklhdacard"
+               cdev "hw:sofhdadsp"
        ]
 
        DisableSequence [
-               cdev "hw:sofsklhdacard"
+               cdev "hw:sofhdadsp"
        ]
 
        Value {
@@ -92,11 +92,11 @@ SectionDevice."Dmic" {
        ]
 
        EnableSequence [
-               cdev "hw:sofsklhdacard"
+               cdev "hw:sofhdadsp"
        ]
 
        DisableSequence [
-               cdev "hw:sofsklhdacard"
+               cdev "hw:sofhdadsp"
        ]
 
        Value {

diff --git a/ucm/sof-skl_hda_card/sof-skl_hda_card.conf b/ucm/sof-hda-dsp/sof-hda-dsp.conf
similarity index 100%
rename from ucm/sof-skl_hda_card/sof-skl_hda_card.conf
rename to ucm/sof-hda-dsp/sof-hda-dsp.conf