From 9105573b6cb71c4821d88e6eef0c4b2cfbb4ea61 Mon Sep 17 00:00:00 2001 From: Svyatoslav Ryhel Date: Sun, 27 Apr 2025 13:02:19 +0300 Subject: [PATCH] tegra: max98089: fix cset names Adjust configs to match Linux kernel MAX98089 codec driver change. Fixes: 725570f9 ("ASoC: max98088: Remove duplicate DACs") Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/556 Signed-off-by: Svyatoslav Ryhel Signed-off-by: Jaroslav Kysela --- ucm2/Tegra/max98089/lge-x3-HiFi.conf | 24 +++++---------- ucm2/Tegra/max98089/lge-x3-VoiceCall.conf | 36 ++++++++--------------- ucm2/Tegra/max98089/lge-x3.conf | 6 ++-- 3 files changed, 22 insertions(+), 44 deletions(-) diff --git a/ucm2/Tegra/max98089/lge-x3-HiFi.conf b/ucm2/Tegra/max98089/lge-x3-HiFi.conf index 3738d72..d074b9f 100644 --- a/ucm2/Tegra/max98089/lge-x3-HiFi.conf +++ b/ucm2/Tegra/max98089/lge-x3-HiFi.conf @@ -11,20 +11,16 @@ SectionDevice."Speaker" { cset "name='Speaker Switch' on" cset "name='Int Spk Switch' on" - cset "name='Left SPK Mixer Left DAC1 Switch' on" - cset "name='Left SPK Mixer Left DAC2 Switch' on" - cset "name='Left SPK Mixer Right DAC1 Switch' on" - cset "name='Left SPK Mixer Right DAC2 Switch' on" + cset "name='Left SPK Mixer Left DAC Switch' on" + cset "name='Left SPK Mixer Right DAC Switch' on" ] DisableSequence [ cset "name='Speaker Switch' off" cset "name='Int Spk Switch' off" - cset "name='Left SPK Mixer Left DAC1 Switch' off" - cset "name='Left SPK Mixer Left DAC2 Switch' off" - cset "name='Left SPK Mixer Right DAC1 Switch' off" - cset "name='Left SPK Mixer Right DAC2 Switch' off" + cset "name='Left SPK Mixer Left DAC Switch' off" + cset "name='Left SPK Mixer Right DAC Switch' off" ] Value { @@ -46,19 +42,15 @@ SectionDevice."Headphones" { EnableSequence [ cset "name='Headphone Switch' on" - cset "name='Left HP Mixer Left DAC1 Switch' on" - cset "name='Left HP Mixer Left DAC2 Switch' on" - cset "name='Right HP Mixer Right DAC1 Switch' on" - cset "name='Right HP Mixer Right DAC2 Switch' on" + cset "name='Left HP Mixer Left DAC Switch' on" + cset "name='Right HP Mixer Right DAC Switch' on" ] DisableSequence [ cset "name='Headphone Switch' off" - cset "name='Left HP Mixer Left DAC1 Switch' off" - cset "name='Left HP Mixer Left DAC2 Switch' off" - cset "name='Right HP Mixer Right DAC1 Switch' off" - cset "name='Right HP Mixer Right DAC2 Switch' off" + cset "name='Left HP Mixer Left DAC Switch' off" + cset "name='Right HP Mixer Right DAC Switch' off" ] Value { diff --git a/ucm2/Tegra/max98089/lge-x3-VoiceCall.conf b/ucm2/Tegra/max98089/lge-x3-VoiceCall.conf index 1634c7b..8e3a389 100644 --- a/ucm2/Tegra/max98089/lge-x3-VoiceCall.conf +++ b/ucm2/Tegra/max98089/lge-x3-VoiceCall.conf @@ -11,20 +11,16 @@ SectionDevice."Speaker" { cset "name='Speaker Switch' on" cset "name='Int Spk Switch' on" - cset "name='Left SPK Mixer Left DAC1 Switch' on" - cset "name='Left SPK Mixer Left DAC2 Switch' on" - cset "name='Left SPK Mixer Right DAC1 Switch' on" - cset "name='Left SPK Mixer Right DAC2 Switch' on" + cset "name='Left SPK Mixer Left DAC Switch' on" + cset "name='Left SPK Mixer Right DAC Switch' on" ] DisableSequence [ cset "name='Speaker Switch' off" cset "name='Int Spk Switch' off" - cset "name='Left SPK Mixer Left DAC1 Switch' off" - cset "name='Left SPK Mixer Left DAC2 Switch' off" - cset "name='Left SPK Mixer Right DAC1 Switch' off" - cset "name='Left SPK Mixer Right DAC2 Switch' off" + cset "name='Left SPK Mixer Left DAC Switch' off" + cset "name='Left SPK Mixer Right DAC Switch' off" ] Value { @@ -47,30 +43,22 @@ SectionDevice."Earpiece" { cset "name='Receiver Switch' on" cset "name='Earpiece Switch' on" - cset "name='Left REC Mixer Left DAC1 Switch' on" - cset "name='Left REC Mixer Left DAC2 Switch' on" - cset "name='Left REC Mixer Right DAC1 Switch' on" - cset "name='Left REC Mixer Right DAC2 Switch' on" + cset "name='Left REC Mixer Left DAC Switch' on" + cset "name='Left REC Mixer Right DAC Switch' on" - cset "name='Right REC Mixer Left DAC1 Switch' on" - cset "name='Right REC Mixer Left DAC2 Switch' on" - cset "name='Right REC Mixer Right DAC1 Switch' on" - cset "name='Right REC Mixer Right DAC2 Switch' on" + cset "name='Right REC Mixer Left DAC Switch' on" + cset "name='Right REC Mixer Right DAC Switch' on" ] DisableSequence [ cset "name='Receiver Switch' off" cset "name='Earpiece Switch' off" - cset "name='Left REC Mixer Left DAC1 Switch' off" - cset "name='Left REC Mixer Left DAC2 Switch' off" - cset "name='Left REC Mixer Right DAC1 Switch' off" - cset "name='Left REC Mixer Right DAC2 Switch' off" + cset "name='Left REC Mixer Left DAC Switch' off" + cset "name='Left REC Mixer Right DAC Switch' off" - cset "name='Right REC Mixer Left DAC1 Switch' off" - cset "name='Right REC Mixer Left DAC2 Switch' off" - cset "name='Right REC Mixer Right DAC1 Switch' off" - cset "name='Right REC Mixer Right DAC2 Switch' off" + cset "name='Right REC Mixer Left DAC Switch' off" + cset "name='Right REC Mixer Right DAC Switch' off" ] Value { diff --git a/ucm2/Tegra/max98089/lge-x3.conf b/ucm2/Tegra/max98089/lge-x3.conf index 9bea0cc..c90c4a1 100644 --- a/ucm2/Tegra/max98089/lge-x3.conf +++ b/ucm2/Tegra/max98089/lge-x3.conf @@ -30,10 +30,8 @@ BootSequence [ cset "name='Internal Mic 2 Switch' off" cset "name='Mic Jack Switch' off" - cset "name='Right SPK Mixer Left DAC1 Switch' on" - cset "name='Right SPK Mixer Left DAC2 Switch' on" - cset "name='Right SPK Mixer Right DAC1 Switch' on" - cset "name='Right SPK Mixer Right DAC2 Switch' on" + cset "name='Right SPK Mixer Left DAC Switch' on" + cset "name='Right SPK Mixer Right DAC Switch' on" ] SectionUseCase."HiFi" { -- 2.47.1