hda: digital pc-beep support hd-audio codecs.
Added digital pc-beep support using linear tone generation for hd-codecs along with initial support for several IDT codecs.
---
pci/Kconfig +8 -0
@@ -517,6 +517,14 @@ config SND_HDA_HWDEP This interface can be used for out-of-band communication with codecs for debugging purposes. +config SND_HDA_INPUT_BEEP + bool "Support digital beep via input layer" + depends on SND_HDA_INTEL + depends on INPUT=y || INPUT=SND_HDA_INTEL + help + Say Y here to build a digital beep interface for HD-audio + driver. This interface is used to generate digital beeps. + config SND_HDA_CODEC_REALTEK bool "Build Realtek HD-audio codec support" depends on SND_HDA_INTEL
pci/hda/Makefile +1 -0
@@ -5,6 +5,7 @@ snd-hda-intel-y := hda_intel.o snd-hda-intel-y += hda_codec.o snd-hda-intel-$(CONFIG_PROC_FS) += hda_proc.o snd-hda-intel-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o +snd-hda-intel-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o snd-hda-intel-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o snd-hda-intel-$(CONFIG_SND_HDA_CODEC_REALTEK) += patch_realtek.o snd-hda-intel-$(CONFIG_SND_HDA_CODEC_CMEDIA) += patch_cmedia.o
pci/hda/hda_beep.c new file +134 -0
134 lines not on this page · raw message
pci/hda/hda_beep.h new file +44 -0
44 lines not on this page · raw message
pci/hda/hda_codec.h +4 -0
@@ -449,6 +449,7 @@ enum {*/ struct hda_bus ; +struct hda_beep ;struct hda_codec ;struct hda_pcm ;struct hda_pcm_stream ;
@@ -634,6 +635,9 @@ struct hda_codec {/* codec specific info */ void *spec; +/* beep device */ +struct hda_beep *beep; +/* widget capabilities cache */ unsigned int num_nodes;hda_nid_t start_nid;
pci/hda/patch_sigmatel.c +8 -0
@@ -33,6 +33,7 @@#include "hda_codec.h" #include "hda_local.h" #include "hda_patch.h" +#include "hda_beep.h" #define NUM_CONTROL_ALLOC 32#define STAC_PWR_EVENT 0x20
@@ -161,6 +162,8 @@ struct sigmatel_spec {unsigned int num_dmuxes;hda_nid_t dig_in_nid;hda_nid_t mono_nid; +hda_nid_t anabeep_nid; +hda_nid_t digbeep_nid;/* pin widgets */ hda_nid_t *pin_nids;
@@ -686,6 +689,8 @@ static struct hda_verb d965_core_init[] = {static struct hda_verb stac927x_core_init[] = {/* set master volume and direct control */ {0x24 ,AC_VERB_SET_VOLUME_KNOB_CONTROL ,0xff }, +/* enable analog pc beep path */ + {0x01 ,AC_VERB_SET_DIGI_CONVERT_2 ,1 <<5 }, {} };
@@ -825,8 +830,11 @@ static struct snd_kcontrol_new stac92hd71bxx_analog_mixer[] = {HDA_CODEC_MUTE_IDX ("Capture Switch" ,0x1 ,0x1d ,0x0 ,HDA_OUTPUT ),HDA_CODEC_VOLUME_IDX ("Capture Mux Volume" ,0x1 ,0x1b ,0x0 ,HDA_OUTPUT ), +/* analog pc-beep replaced with digital beep support */ +/* HDA_CODEC_VOLUME("PC Beep Volume", 0x17, 0x2, HDA_INPUT), HDA_CODEC_MUTE("PC Beep Switch", 0x17, 0x2, HDA_INPUT), +*/ HDA_CODEC_MUTE ("Analog Loopback 1" ,0x17 ,0x3 ,HDA_INPUT ), HDA_CODEC_MUTE("Analog Loopback 2", 0x17, 0x4, HDA_INPUT),
@@ -2603,6 +2611,34 @@ static int stac92xx_auto_create_mono_output_ctls(struct
hda_codec *codec)
"Mono Mux", spec->mono_nid);
}
+/* create PC beep volume controls */
+static int stac92xx_auto_create_beep_ctls(struct hda_codec *codec,
+ hda_nid_t nid)
+{
+ struct sigmatel_spec *spec = codec->spec;
+ u32 caps = query_amp_caps(codec, nid, HDA_OUTPUT);
+ int err;
+
+ /* check for mute support for the the amp */
+ if ((caps & AC_AMPCAP_MUTE) >> AC_AMPCAP_MUTE_SHIFT) {
+ err = stac92xx_add_control(spec, STAC_CTL_WIDGET_MUTE,
+ "PC Beep Playback Switch",
+ HDA_COMPOSE_AMP_VAL(nid, 1, 0, HDA_OUTPUT));
+ if (err < 0)
+ return err;
+ }
+
+ /* check to see if there is volume support for the amp */
+ if ((caps & AC_AMPCAP_NUM_STEPS) >> AC_AMPCAP_NUM_STEPS_SHIFT) {
+ err = stac92xx_add_control(spec, STAC_CTL_WIDGET_VOL,
+ "PC Beep Playback Volume",
+ HDA_COMPOSE_AMP_VAL(nid, 1, 0, HDA_OUTPUT));
+ if (err < 0)
+ return err;
+ }
+ return 0;
+}
+
/* labels for dmic mux inputs */
static const char *stac92xx_dmic_labels[5] = {
"Analog Inputs", "Digital Mic 1", "Digital Mic 2",
@@ -2838,6 +2874,28 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
if (err < 0)
return err;
+ /* setup analog beep controls */
+ if (spec->anabeep_nid > 0) {
+ err = stac92xx_auto_create_beep_ctls(codec,
+ spec->anabeep_nid);
+ if (err < 0)
+ return err;
+ }
+
+ /* setup digital beep controls and input device */
+#ifdef CONFIG_SND_HDA_INPUT_BEEP
+ if (spec->digbeep_nid > 0) {
+ hda_nid_t nid = spec->digbeep_nid;
+
+ err = stac92xx_auto_create_beep_ctls(codec, nid);
+ if (err < 0)
+ return err;
+ err = snd_hda_attach_beep_device(codec, nid);
+ if (err < 0)
+ return err;
+ }
+#endif
+
if (hp_speaker_swap == 1) {
/* Restore the hp_outs and line_outs */ memcpy(spec->autocfg.hp_pins, spec->autocfg.line_out_pins,
@@ -3152,6 +3210,7 @@ static void stac92xx_free(struct hda_codec *codec)
kfree(spec->bios_pin_configs);
kfree(spec);
+ snd_hda_detach_beep_device(codec);
}
static void stac92xx_set_pinctl(struct hda_codec *codec, hda_nid_t nid,
@@ -3540,6 +3599,7 @@ again:
spec->aloopback_mask = 0x01;
spec->aloopback_shift = 8;
+ spec->digbeep_nid = 0x1c;
spec->mux_nids = stac92hd73xx_mux_nids;
spec->adc_nids = stac92hd73xx_adc_nids;
spec->dmic_nids = stac92hd73xx_dmic_nids;
@@ -3674,6 +3734,7 @@ again:
spec->gpio_dir = 0x01;
spec->gpio_data = 0x01;
+ spec->digbeep_nid = 0x26;
spec->mux_nids = stac92hd71bxx_mux_nids; spec->adc_nids = stac92hd71bxx_adc_nids; spec->dmic_nids = stac92hd71bxx_dmic_nids;
@@ -3845,6 +3906,7 @@ static int patch_stac927x(struct hda_codec *codec)
stac92xx_set_config_regs(codec);
}
+ spec->digbeep_nid = 0x23;
spec->adc_nids = stac927x_adc_nids;
spec->num_adcs = ARRAY_SIZE(stac927x_adc_nids); spec->mux_nids = stac927x_mux_nids;
@@ -3965,6 +4027,7 @@ static int patch_stac9205(struct hda_codec *codec)
stac92xx_set_config_regs(codec);
}
+ spec->digbeep_nid = 0x23;
spec->adc_nids = stac9205_adc_nids; spec->num_adcs = ARRAY_SIZE(stac9205_adc_nids); spec->mux_nids = stac9205_mux_nids;