diff options
author | Einar Rünkaru <einarry@smail.ee> | 2009-12-16 15:41:36 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-17 06:31:29 -0500 |
commit | c0f8faf0c7cd497ec7c1d61e1e9424f4384c1f68 (patch) | |
tree | 41a24477123899fd8d8443ccadc38f41ca98dc6d /sound/pci | |
parent | 254bba6a7e28c77d8b32d9eaeba02d4943ee844e (diff) |
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 ca9ad9fddbf2..c578c28f368e 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c | |||
@@ -29,6 +29,7 @@ | |||
29 | 29 | ||
30 | #include "hda_codec.h" | 30 | #include "hda_codec.h" |
31 | #include "hda_local.h" | 31 | #include "hda_local.h" |
32 | #include "hda_beep.h" | ||
32 | 33 | ||
33 | #define CXT_PIN_DIR_IN 0x00 | 34 | #define CXT_PIN_DIR_IN 0x00 |
34 | #define CXT_PIN_DIR_OUT 0x01 | 35 | #define CXT_PIN_DIR_OUT 0x01 |
@@ -477,6 +478,7 @@ static void conexant_free(struct hda_codec *codec) | |||
477 | snd_array_free(&spec->jacks); | 478 | snd_array_free(&spec->jacks); |
478 | } | 479 | } |
479 | #endif | 480 | #endif |
481 | snd_hda_detach_beep_device(codec); | ||
480 | kfree(codec->spec); | 482 | kfree(codec->spec); |
481 | } | 483 | } |
482 | 484 | ||
@@ -2229,6 +2231,7 @@ static struct snd_kcontrol_new cxt5066_vostro_mixers[] = { | |||
2229 | .put = cxt5066_mic_boost_mux_enum_put, | 2231 | .put = cxt5066_mic_boost_mux_enum_put, |
2230 | .private_value = 0x23 | 0x100, | 2232 | .private_value = 0x23 | 0x100, |
2231 | }, | 2233 | }, |
2234 | HDA_CODEC_VOLUME_MONO("Beep Playback Volume", 0x13, 1, 0x0, HDA_OUTPUT), | ||
2232 | {} | 2235 | {} |
2233 | }; | 2236 | }; |
2234 | 2237 | ||
@@ -2528,6 +2531,7 @@ static int patch_cxt5066(struct hda_codec *codec) | |||
2528 | spec->mixers[spec->num_mixers++] = cxt5066_vostro_mixers; | 2531 | spec->mixers[spec->num_mixers++] = cxt5066_vostro_mixers; |
2529 | spec->port_d_mode = 0; | 2532 | spec->port_d_mode = 0; |
2530 | spec->dell_vostro = 1; | 2533 | spec->dell_vostro = 1; |
2534 | snd_hda_attach_beep_device(codec, 0x13); | ||
2531 | 2535 | ||
2532 | /* no S/PDIF out */ | 2536 | /* no S/PDIF out */ |
2533 | spec->multiout.dig_out_nid = 0; | 2537 | spec->multiout.dig_out_nid = 0; |