mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-27 06:18:13 +00:00
Koen Kooi
c4eefd7530
Runtime tested on a beaglebone A3 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
58 lines
1.7 KiB
Diff
58 lines
1.7 KiB
Diff
From c237e8b240ea09139d387e89f7474fbcd2b4bd0c Mon Sep 17 00:00:00 2001
|
|
From: David Henningsson <david.henningsson@canonical.com>
|
|
Date: Mon, 2 Jan 2012 12:40:15 +0100
|
|
Subject: [PATCH 009/130] ALSA: HDA: Fix master control for Cirrus Logic 421X
|
|
|
|
commit 40d03e63e91af8ddccdfd5a536cc2a6e51433e1d upstream.
|
|
|
|
The control name "HP/Speakers" is non-standard, and since there is
|
|
only one DAC on this chip there is no need for a virtual master
|
|
anyway.
|
|
|
|
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
|
---
|
|
sound/pci/hda/patch_cirrus.c | 13 +------------
|
|
1 files changed, 1 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
|
|
index 70a7abd..f55ceb6 100644
|
|
--- a/sound/pci/hda/patch_cirrus.c
|
|
+++ b/sound/pci/hda/patch_cirrus.c
|
|
@@ -1771,30 +1771,19 @@ static int build_cs421x_output(struct hda_codec *codec)
|
|
struct auto_pin_cfg *cfg = &spec->autocfg;
|
|
struct snd_kcontrol *kctl;
|
|
int err;
|
|
- char *name = "HP/Speakers";
|
|
+ char *name = "Master";
|
|
|
|
fix_volume_caps(codec, dac);
|
|
- if (!spec->vmaster_sw) {
|
|
- err = add_vmaster(codec, dac);
|
|
- if (err < 0)
|
|
- return err;
|
|
- }
|
|
|
|
err = add_mute(codec, name, 0,
|
|
HDA_COMPOSE_AMP_VAL(dac, 3, 0, HDA_OUTPUT), 0, &kctl);
|
|
if (err < 0)
|
|
return err;
|
|
- err = snd_ctl_add_slave(spec->vmaster_sw, kctl);
|
|
- if (err < 0)
|
|
- return err;
|
|
|
|
err = add_volume(codec, name, 0,
|
|
HDA_COMPOSE_AMP_VAL(dac, 3, 0, HDA_OUTPUT), 0, &kctl);
|
|
if (err < 0)
|
|
return err;
|
|
- err = snd_ctl_add_slave(spec->vmaster_vol, kctl);
|
|
- if (err < 0)
|
|
- return err;
|
|
|
|
if (cfg->speaker_outs) {
|
|
err = snd_hda_ctl_add(codec, 0,
|
|
--
|
|
1.7.7.4
|
|
|