diff options
| author | Einar Rünkaru <einarry@smail.ee> | 2009-12-16 22:41:36 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-17 12:31:29 +0100 |
| commit | c0f8faf0c7cd497ec7c1d61e1e9424f4384c1f68 (patch) | |
| tree | 41a24477123899fd8d8443ccadc38f41ca98dc6d /sound/pci | |
| parent | 254bba6a7e28c77d8b32d9eaeba02d4943ee844e (diff) | |
| download | linux-3.10-c0f8faf0c7cd497ec7c1d61e1e9424f4384c1f68.tar.gz linux-3.10-c0f8faf0c7cd497ec7c1d61e1e9424f4384c1f68.tar.bz2 linux-3.10-c0f8faf0c7cd497ec7c1d61e1e9424f4384c1f68.zip | |
ALSA: hda - Make use of beep device found in Dell Vostro 1015n
Conexant CX20583-10Z has digital beep device with volume control.
Making use of them.
Signed-off-by: Einar Rünkaru <einarry@smail.ee>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index ca9ad9fddbf..c578c28f368 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -29,6 +29,7 @@ #include "hda_codec.h" #include "hda_local.h" +#include "hda_beep.h" #define CXT_PIN_DIR_IN 0x00 #define CXT_PIN_DIR_OUT 0x01 @@ -477,6 +478,7 @@ static void conexant_free(struct hda_codec *codec) snd_array_free(&spec->jacks); } #endif + snd_hda_detach_beep_device(codec); kfree(codec->spec); } @@ -2229,6 +2231,7 @@ static struct snd_kcontrol_new cxt5066_vostro_mixers[] = { .put = cxt5066_mic_boost_mux_enum_put, .private_value = 0x23 | 0x100, }, + HDA_CODEC_VOLUME_MONO("Beep Playback Volume", 0x13, 1, 0x0, HDA_OUTPUT), {} }; @@ -2528,6 +2531,7 @@ static int patch_cxt5066(struct hda_codec *codec) spec->mixers[spec->num_mixers++] = cxt5066_vostro_mixers; spec->port_d_mode = 0; spec->dell_vostro = 1; + snd_hda_attach_beep_device(codec, 0x13); /* no S/PDIF out */ spec->multiout.dig_out_nid = 0; |