From a9b808fce97724bd41f14867b3ff79304b0e2bf4 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 21 Nov 2019 08:04:55 +0100 Subject: [PATCH] chtnau8824: adapt to ucm2 Signed-off-by: Jaroslav Kysela --- .../HiFi.conf | 27 ------------------- ...ube-i1_TF-Defaultstring-CherryTrailCR.conf | 6 ----- .../chtnau8824/HiFi-mono.conf | 6 ++--- {ucm => ucm2}/chtnau8824/HiFi.conf | 6 ++--- .../PIPO-W2S-Defaultstring-CherryTrailCR.conf | 1 + .../chtnau8824/chtnau8824-mono.conf | 4 ++- {ucm => ucm2}/chtnau8824/chtnau8824.conf | 2 ++ ...ube-i1_TF-Defaultstring-CherryTrailCR.conf | 1 + {ucm => ucm2}/codecs/nau8824/EnableSeq.conf | 0 {ucm => ucm2}/codecs/nau8824/HeadPhones.conf | 4 --- {ucm => ucm2}/codecs/nau8824/HeadsetMic.conf | 4 --- {ucm => ucm2}/codecs/nau8824/InternalMic.conf | 4 --- {ucm => ucm2}/codecs/nau8824/MonoSpeaker.conf | 4 --- {ucm => ucm2}/codecs/nau8824/Speaker.conf | 4 --- 14 files changed, 11 insertions(+), 62 deletions(-) delete mode 100644 ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf delete mode 100644 ucm/cube-i1_TF-Defaultstring-CherryTrailCR/cube-i1_TF-Defaultstring-CherryTrailCR.conf rename ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf => ucm2/chtnau8824/HiFi-mono.conf (78%) rename {ucm => ucm2}/chtnau8824/HiFi.conf (77%) create mode 120000 ucm2/chtnau8824/PIPO-W2S-Defaultstring-CherryTrailCR.conf rename ucm/PIPO-W2S-Defaultstring-CherryTrailCR/PIPO-W2S-Defaultstring-CherryTrailCR.conf => ucm2/chtnau8824/chtnau8824-mono.conf (58%) rename {ucm => ucm2}/chtnau8824/chtnau8824.conf (90%) create mode 120000 ucm2/chtnau8824/cube-i1_TF-Defaultstring-CherryTrailCR.conf rename {ucm => ucm2}/codecs/nau8824/EnableSeq.conf (100%) rename {ucm => ucm2}/codecs/nau8824/HeadPhones.conf (85%) rename {ucm => ucm2}/codecs/nau8824/HeadsetMic.conf (91%) rename {ucm => ucm2}/codecs/nau8824/InternalMic.conf (91%) rename {ucm => ucm2}/codecs/nau8824/MonoSpeaker.conf (91%) rename {ucm => ucm2}/codecs/nau8824/Speaker.conf (89%) diff --git a/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf b/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf deleted file mode 100644 index b931b79..0000000 --- a/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf +++ /dev/null @@ -1,27 +0,0 @@ - -SectionVerb { - - Value { - TQ "HiFi" - # ALSA PCM device for HiFi - PlaybackPCM "hw:chtnau8824" - CapturePCM "hw:chtnau8824" - } - - EnableSequence [ - cdev "hw:chtnau8824" - - - ] - - DisableSequence [ - cdev "hw:chtnau8824" - - ] -} - - - - - - diff --git a/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/cube-i1_TF-Defaultstring-CherryTrailCR.conf b/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/cube-i1_TF-Defaultstring-CherryTrailCR.conf deleted file mode 100644 index 3775ed4..0000000 --- a/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/cube-i1_TF-Defaultstring-CherryTrailCR.conf +++ /dev/null @@ -1,6 +0,0 @@ -Comment "chtnau8824 internal card" - -SectionUseCase."HiFi" { - File "../cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf" - Comment "Default" -} diff --git a/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf b/ucm2/chtnau8824/HiFi-mono.conf similarity index 78% rename from ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf rename to ucm2/chtnau8824/HiFi-mono.conf index b931b79..3433d03 100644 --- a/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf +++ b/ucm2/chtnau8824/HiFi-mono.conf @@ -4,18 +4,16 @@ SectionVerb { Value { TQ "HiFi" # ALSA PCM device for HiFi - PlaybackPCM "hw:chtnau8824" - CapturePCM "hw:chtnau8824" + PlaybackPCM "hw:${CardId}" + CapturePCM "hw:${CardId}" } EnableSequence [ - cdev "hw:chtnau8824" ] DisableSequence [ - cdev "hw:chtnau8824" ] } diff --git a/ucm/chtnau8824/HiFi.conf b/ucm2/chtnau8824/HiFi.conf similarity index 77% rename from ucm/chtnau8824/HiFi.conf rename to ucm2/chtnau8824/HiFi.conf index 845cbca..9f7ac74 100644 --- a/ucm/chtnau8824/HiFi.conf +++ b/ucm2/chtnau8824/HiFi.conf @@ -4,18 +4,16 @@ SectionVerb { Value { TQ "HiFi" # ALSA PCM device for HiFi - PlaybackPCM "hw:chtnau8824" - CapturePCM "hw:chtnau8824" + PlaybackPCM "hw:${CardId}" + CapturePCM "hw:${CardId}" } EnableSequence [ - cdev "hw:chtnau8824" ] DisableSequence [ - cdev "hw:chtnau8824" ] } diff --git a/ucm2/chtnau8824/PIPO-W2S-Defaultstring-CherryTrailCR.conf b/ucm2/chtnau8824/PIPO-W2S-Defaultstring-CherryTrailCR.conf new file mode 120000 index 0000000..e3af8b6 --- /dev/null +++ b/ucm2/chtnau8824/PIPO-W2S-Defaultstring-CherryTrailCR.conf @@ -0,0 +1 @@ +chtnau8824-mono.conf \ No newline at end of file diff --git a/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/PIPO-W2S-Defaultstring-CherryTrailCR.conf b/ucm2/chtnau8824/chtnau8824-mono.conf similarity index 58% rename from ucm/PIPO-W2S-Defaultstring-CherryTrailCR/PIPO-W2S-Defaultstring-CherryTrailCR.conf rename to ucm2/chtnau8824/chtnau8824-mono.conf index 37a8d04..75f4870 100644 --- a/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/PIPO-W2S-Defaultstring-CherryTrailCR.conf +++ b/ucm2/chtnau8824/chtnau8824-mono.conf @@ -1,6 +1,8 @@ +Syntax 2 + Comment "chtnau8824 internal card" SectionUseCase."HiFi" { - File "../PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf" + File "HiFi-mono.conf" Comment "Default" } diff --git a/ucm/chtnau8824/chtnau8824.conf b/ucm2/chtnau8824/chtnau8824.conf similarity index 90% rename from ucm/chtnau8824/chtnau8824.conf rename to ucm2/chtnau8824/chtnau8824.conf index 189b0db..acd5deb 100644 --- a/ucm/chtnau8824/chtnau8824.conf +++ b/ucm2/chtnau8824/chtnau8824.conf @@ -1,3 +1,5 @@ +Syntax 2 + Comment "chtnau8824 internal card" SectionUseCase."HiFi" { diff --git a/ucm2/chtnau8824/cube-i1_TF-Defaultstring-CherryTrailCR.conf b/ucm2/chtnau8824/cube-i1_TF-Defaultstring-CherryTrailCR.conf new file mode 120000 index 0000000..e3af8b6 --- /dev/null +++ b/ucm2/chtnau8824/cube-i1_TF-Defaultstring-CherryTrailCR.conf @@ -0,0 +1 @@ +chtnau8824-mono.conf \ No newline at end of file diff --git a/ucm/codecs/nau8824/EnableSeq.conf b/ucm2/codecs/nau8824/EnableSeq.conf similarity index 100% rename from ucm/codecs/nau8824/EnableSeq.conf rename to ucm2/codecs/nau8824/EnableSeq.conf diff --git a/ucm/codecs/nau8824/HeadPhones.conf b/ucm2/codecs/nau8824/HeadPhones.conf similarity index 85% rename from ucm/codecs/nau8824/HeadPhones.conf rename to ucm2/codecs/nau8824/HeadPhones.conf index 8ed6f19..f35f4e2 100644 --- a/ucm/codecs/nau8824/HeadPhones.conf +++ b/ucm2/codecs/nau8824/HeadPhones.conf @@ -12,14 +12,10 @@ SectionDevice."Headphones" { ] EnableSequence [ - cdev "hw:chtnau8824" - cset "name='Headphone Switch' on" ] DisableSequence [ - cdev "hw:chtnau8824" - cset "name='Headphone Switch' off" ] } diff --git a/ucm/codecs/nau8824/HeadsetMic.conf b/ucm2/codecs/nau8824/HeadsetMic.conf similarity index 91% rename from ucm/codecs/nau8824/HeadsetMic.conf rename to ucm2/codecs/nau8824/HeadsetMic.conf index 11b0b52..bc17f9f 100644 --- a/ucm/codecs/nau8824/HeadsetMic.conf +++ b/ucm2/codecs/nau8824/HeadsetMic.conf @@ -11,8 +11,6 @@ SectionDevice."HeadsetMic" { ] EnableSequence [ - cdev "hw:chtnau8824" - cset "name='ADC CH0 Select' 1" cset "name='ADC CH1 Select' 1" @@ -22,8 +20,6 @@ SectionDevice."HeadsetMic" { ] DisableSequence [ - cdev "hw:chtnau8824" - cset "name='Headset Mic Switch' off" cset "name='Right ADC HSMIC Switch' off" cset "name='Left ADC HSMIC Switch' off" diff --git a/ucm/codecs/nau8824/InternalMic.conf b/ucm2/codecs/nau8824/InternalMic.conf similarity index 91% rename from ucm/codecs/nau8824/InternalMic.conf rename to ucm2/codecs/nau8824/InternalMic.conf index c6a741c..3793d64 100644 --- a/ucm/codecs/nau8824/InternalMic.conf +++ b/ucm2/codecs/nau8824/InternalMic.conf @@ -11,8 +11,6 @@ SectionDevice."InternalMic" { ] EnableSequence [ - cdev "hw:chtnau8824" - cset "name='ADC CH0 Select' 0" cset "name='ADC CH1 Select' 0" @@ -22,8 +20,6 @@ SectionDevice."InternalMic" { ] DisableSequence [ - cdev "hw:chtnau8824" - cset "name='Int Mic Switch' off" cset "name='Right ADC MIC Switch' off" cset "name='Left ADC MIC Switch' off" diff --git a/ucm/codecs/nau8824/MonoSpeaker.conf b/ucm2/codecs/nau8824/MonoSpeaker.conf similarity index 91% rename from ucm/codecs/nau8824/MonoSpeaker.conf rename to ucm2/codecs/nau8824/MonoSpeaker.conf index 8673518..5321c8a 100644 --- a/ucm/codecs/nau8824/MonoSpeaker.conf +++ b/ucm2/codecs/nau8824/MonoSpeaker.conf @@ -11,8 +11,6 @@ SectionDevice."MonoSpeaker" { ] EnableSequence [ - cdev "hw:chtnau8824" - # nau8824 mono speaker boards have the speaker on the right chan cset "name='Speaker Left DACL Volume' 0" cset "name='Speaker Left DACR Volume' 0" @@ -22,8 +20,6 @@ SectionDevice."MonoSpeaker" { ] DisableSequence [ - cdev "hw:chtnau8824" - cset "name='Ext Spk Switch' off" ] } diff --git a/ucm/codecs/nau8824/Speaker.conf b/ucm2/codecs/nau8824/Speaker.conf similarity index 89% rename from ucm/codecs/nau8824/Speaker.conf rename to ucm2/codecs/nau8824/Speaker.conf index e4d25b0..474c373 100644 --- a/ucm/codecs/nau8824/Speaker.conf +++ b/ucm2/codecs/nau8824/Speaker.conf @@ -11,8 +11,6 @@ SectionDevice."Speaker" { ] EnableSequence [ - cdev "hw:chtnau8824" - cset "name='Speaker Left DACL Volume' 1" cset "name='Speaker Left DACR Volume' 0" cset "name='Speaker Right DACL Volume' 0" @@ -21,8 +19,6 @@ SectionDevice."Speaker" { ] DisableSequence [ - cdev "hw:chtnau8824" - cset "name='Ext Spk Switch' off" ] } -- 2.47.1