Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: max98088: Remove duplicate DACs
This codec only has one set of left and right DACs, remove the duplicate
DACs with duplicated bits controlling them as the userspace can set those
controls to mismatched value. This most likely does break userspace ABI,
but there seem to be no in-kernel users.
Signed-off-by: Marek Vasut <marex@denx.de>
Link: https://patch.msgid.link/20241108235453.196289-1-marex@denx.de
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
Marek Vasut
and committed by
Mark Brown
725570f9
e90dbd38
+26
-54
+26
-54
sound/soc/codecs/max98088.c
+26
-54
sound/soc/codecs/max98088.c
···
515
515
516
516
/* Left speaker mixer switch */
517
517
static const struct snd_kcontrol_new max98088_left_speaker_mixer_controls[] = {
518
-
SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 0, 1, 0),
519
-
SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 7, 1, 0),
520
-
SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, 0, 1, 0),
521
-
SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, 7, 1, 0),
518
+
SOC_DAPM_SINGLE("Left DAC Switch", M98088_REG_2B_MIX_SPK_LEFT, 0, 1, 0),
519
+
SOC_DAPM_SINGLE("Right DAC Switch", M98088_REG_2B_MIX_SPK_LEFT, 7, 1, 0),
522
520
SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 5, 1, 0),
523
521
SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, 6, 1, 0),
524
522
SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 1, 1, 0),
···
527
529
528
530
/* Right speaker mixer switch */
529
531
static const struct snd_kcontrol_new max98088_right_speaker_mixer_controls[] = {
530
-
SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_2C_MIX_SPK_RIGHT, 7, 1, 0),
531
-
SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_2C_MIX_SPK_RIGHT, 0, 1, 0),
532
-
SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_2C_MIX_SPK_RIGHT, 7, 1, 0),
533
-
SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_2C_MIX_SPK_RIGHT, 0, 1, 0),
532
+
SOC_DAPM_SINGLE("Left DAC Switch", M98088_REG_2C_MIX_SPK_RIGHT, 7, 1, 0),
533
+
SOC_DAPM_SINGLE("Right DAC Switch", M98088_REG_2C_MIX_SPK_RIGHT, 0, 1, 0),
534
534
SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_2C_MIX_SPK_RIGHT, 5, 1, 0),
535
535
SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_2C_MIX_SPK_RIGHT, 6, 1, 0),
536
536
SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_2C_MIX_SPK_RIGHT, 1, 1, 0),
···
539
543
540
544
/* Left headphone mixer switch */
541
545
static const struct snd_kcontrol_new max98088_left_hp_mixer_controls[] = {
542
-
SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_25_MIX_HP_LEFT, 0, 1, 0),
543
-
SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_25_MIX_HP_LEFT, 7, 1, 0),
544
-
SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_25_MIX_HP_LEFT, 0, 1, 0),
545
-
SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_25_MIX_HP_LEFT, 7, 1, 0),
546
+
SOC_DAPM_SINGLE("Left DAC Switch", M98088_REG_25_MIX_HP_LEFT, 0, 1, 0),
547
+
SOC_DAPM_SINGLE("Right DAC Switch", M98088_REG_25_MIX_HP_LEFT, 7, 1, 0),
546
548
SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_25_MIX_HP_LEFT, 5, 1, 0),
547
549
SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_25_MIX_HP_LEFT, 6, 1, 0),
548
550
SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_25_MIX_HP_LEFT, 1, 1, 0),
···
551
557
552
558
/* Right headphone mixer switch */
553
559
static const struct snd_kcontrol_new max98088_right_hp_mixer_controls[] = {
554
-
SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_26_MIX_HP_RIGHT, 7, 1, 0),
555
-
SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_26_MIX_HP_RIGHT, 0, 1, 0),
556
-
SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_26_MIX_HP_RIGHT, 7, 1, 0),
557
-
SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_26_MIX_HP_RIGHT, 0, 1, 0),
560
+
SOC_DAPM_SINGLE("Left DAC Switch", M98088_REG_26_MIX_HP_RIGHT, 7, 1, 0),
561
+
SOC_DAPM_SINGLE("Right DAC Switch", M98088_REG_26_MIX_HP_RIGHT, 0, 1, 0),
558
562
SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_26_MIX_HP_RIGHT, 5, 1, 0),
559
563
SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_26_MIX_HP_RIGHT, 6, 1, 0),
560
564
SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_26_MIX_HP_RIGHT, 1, 1, 0),
···
563
571
564
572
/* Left earpiece/receiver mixer switch */
565
573
static const struct snd_kcontrol_new max98088_left_rec_mixer_controls[] = {
566
-
SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_28_MIX_REC_LEFT, 0, 1, 0),
567
-
SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_28_MIX_REC_LEFT, 7, 1, 0),
568
-
SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_28_MIX_REC_LEFT, 0, 1, 0),
569
-
SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_28_MIX_REC_LEFT, 7, 1, 0),
574
+
SOC_DAPM_SINGLE("Left DAC Switch", M98088_REG_28_MIX_REC_LEFT, 0, 1, 0),
575
+
SOC_DAPM_SINGLE("Right DAC Switch", M98088_REG_28_MIX_REC_LEFT, 7, 1, 0),
570
576
SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_28_MIX_REC_LEFT, 5, 1, 0),
571
577
SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_28_MIX_REC_LEFT, 6, 1, 0),
572
578
SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_28_MIX_REC_LEFT, 1, 1, 0),
···
575
585
576
586
/* Right earpiece/receiver mixer switch */
577
587
static const struct snd_kcontrol_new max98088_right_rec_mixer_controls[] = {
578
-
SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_29_MIX_REC_RIGHT, 7, 1, 0),
579
-
SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_29_MIX_REC_RIGHT, 0, 1, 0),
580
-
SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_29_MIX_REC_RIGHT, 7, 1, 0),
581
-
SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_29_MIX_REC_RIGHT, 0, 1, 0),
588
+
SOC_DAPM_SINGLE("Left DAC Switch", M98088_REG_29_MIX_REC_RIGHT, 7, 1, 0),
589
+
SOC_DAPM_SINGLE("Right DAC Switch", M98088_REG_29_MIX_REC_RIGHT, 0, 1, 0),
582
590
SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_29_MIX_REC_RIGHT, 5, 1, 0),
583
591
SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_29_MIX_REC_RIGHT, 6, 1, 0),
584
592
SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_29_MIX_REC_RIGHT, 1, 1, 0),
···
705
717
SND_SOC_DAPM_ADC("ADCL", "HiFi Capture", M98088_REG_4C_PWR_EN_IN, 1, 0),
706
718
SND_SOC_DAPM_ADC("ADCR", "HiFi Capture", M98088_REG_4C_PWR_EN_IN, 0, 0),
707
719
708
-
SND_SOC_DAPM_DAC("DACL1", "HiFi Playback",
720
+
SND_SOC_DAPM_DAC("DACL", "HiFi Playback",
709
721
M98088_REG_4D_PWR_EN_OUT, 1, 0),
710
-
SND_SOC_DAPM_DAC("DACR1", "HiFi Playback",
711
-
M98088_REG_4D_PWR_EN_OUT, 0, 0),
712
-
SND_SOC_DAPM_DAC("DACL2", "Aux Playback",
713
-
M98088_REG_4D_PWR_EN_OUT, 1, 0),
714
-
SND_SOC_DAPM_DAC("DACR2", "Aux Playback",
722
+
SND_SOC_DAPM_DAC("DACR", "HiFi Playback",
715
723
M98088_REG_4D_PWR_EN_OUT, 0, 0),
716
724
717
725
SND_SOC_DAPM_PGA("HP Left Out", M98088_REG_4D_PWR_EN_OUT,
···
803
819
804
820
static const struct snd_soc_dapm_route max98088_audio_map[] = {
805
821
/* Left headphone output mixer */
806
-
{"Left HP Mixer", "Left DAC1 Switch", "DACL1"},
807
-
{"Left HP Mixer", "Left DAC2 Switch", "DACL2"},
808
-
{"Left HP Mixer", "Right DAC1 Switch", "DACR1"},
809
-
{"Left HP Mixer", "Right DAC2 Switch", "DACR2"},
822
+
{"Left HP Mixer", "Left DAC Switch", "DACL"},
823
+
{"Left HP Mixer", "Right DAC Switch", "DACR"},
810
824
{"Left HP Mixer", "MIC1 Switch", "MIC1 Input"},
811
825
{"Left HP Mixer", "MIC2 Switch", "MIC2 Input"},
812
826
{"Left HP Mixer", "INA1 Switch", "INA1 Input"},
···
813
831
{"Left HP Mixer", "INB2 Switch", "INB2 Input"},
814
832
815
833
/* Right headphone output mixer */
816
-
{"Right HP Mixer", "Left DAC1 Switch", "DACL1"},
817
-
{"Right HP Mixer", "Left DAC2 Switch", "DACL2" },
818
-
{"Right HP Mixer", "Right DAC1 Switch", "DACR1"},
819
-
{"Right HP Mixer", "Right DAC2 Switch", "DACR2"},
834
+
{"Right HP Mixer", "Left DAC Switch", "DACL"},
835
+
{"Right HP Mixer", "Right DAC Switch", "DACR"},
820
836
{"Right HP Mixer", "MIC1 Switch", "MIC1 Input"},
821
837
{"Right HP Mixer", "MIC2 Switch", "MIC2 Input"},
822
838
{"Right HP Mixer", "INA1 Switch", "INA1 Input"},
···
823
843
{"Right HP Mixer", "INB2 Switch", "INB2 Input"},
824
844
825
845
/* Left speaker output mixer */
826
-
{"Left SPK Mixer", "Left DAC1 Switch", "DACL1"},
827
-
{"Left SPK Mixer", "Left DAC2 Switch", "DACL2"},
828
-
{"Left SPK Mixer", "Right DAC1 Switch", "DACR1"},
829
-
{"Left SPK Mixer", "Right DAC2 Switch", "DACR2"},
846
+
{"Left SPK Mixer", "Left DAC Switch", "DACL"},
847
+
{"Left SPK Mixer", "Right DAC Switch", "DACR"},
830
848
{"Left SPK Mixer", "MIC1 Switch", "MIC1 Input"},
831
849
{"Left SPK Mixer", "MIC2 Switch", "MIC2 Input"},
832
850
{"Left SPK Mixer", "INA1 Switch", "INA1 Input"},
···
833
855
{"Left SPK Mixer", "INB2 Switch", "INB2 Input"},
834
856
835
857
/* Right speaker output mixer */
836
-
{"Right SPK Mixer", "Left DAC1 Switch", "DACL1"},
837
-
{"Right SPK Mixer", "Left DAC2 Switch", "DACL2"},
838
-
{"Right SPK Mixer", "Right DAC1 Switch", "DACR1"},
839
-
{"Right SPK Mixer", "Right DAC2 Switch", "DACR2"},
858
+
{"Right SPK Mixer", "Left DAC Switch", "DACL"},
859
+
{"Right SPK Mixer", "Right DAC Switch", "DACR"},
840
860
{"Right SPK Mixer", "MIC1 Switch", "MIC1 Input"},
841
861
{"Right SPK Mixer", "MIC2 Switch", "MIC2 Input"},
842
862
{"Right SPK Mixer", "INA1 Switch", "INA1 Input"},
···
843
867
{"Right SPK Mixer", "INB2 Switch", "INB2 Input"},
844
868
845
869
/* Earpiece/Receiver output mixer */
846
-
{"Left REC Mixer", "Left DAC1 Switch", "DACL1"},
847
-
{"Left REC Mixer", "Left DAC2 Switch", "DACL2"},
848
-
{"Left REC Mixer", "Right DAC1 Switch", "DACR1"},
849
-
{"Left REC Mixer", "Right DAC2 Switch", "DACR2"},
870
+
{"Left REC Mixer", "Left DAC Switch", "DACL"},
871
+
{"Left REC Mixer", "Right DAC Switch", "DACR"},
850
872
{"Left REC Mixer", "MIC1 Switch", "MIC1 Input"},
851
873
{"Left REC Mixer", "MIC2 Switch", "MIC2 Input"},
852
874
{"Left REC Mixer", "INA1 Switch", "INA1 Input"},
···
853
879
{"Left REC Mixer", "INB2 Switch", "INB2 Input"},
854
880
855
881
/* Earpiece/Receiver output mixer */
856
-
{"Right REC Mixer", "Left DAC1 Switch", "DACL1"},
857
-
{"Right REC Mixer", "Left DAC2 Switch", "DACL2"},
858
-
{"Right REC Mixer", "Right DAC1 Switch", "DACR1"},
859
-
{"Right REC Mixer", "Right DAC2 Switch", "DACR2"},
882
+
{"Right REC Mixer", "Left DAC Switch", "DACL"},
883
+
{"Right REC Mixer", "Right DAC Switch", "DACR"},
860
884
{"Right REC Mixer", "MIC1 Switch", "MIC1 Input"},
861
885
{"Right REC Mixer", "MIC2 Switch", "MIC2 Input"},
862
886
{"Right REC Mixer", "INA1 Switch", "INA1 Input"},