Merge branch 'fix/hda' into topic/hda (305355aa) · Commits · e / devices / android_kernel_teracube_emerald

sound/pci/hda/hda_beep.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -51,19 +51,22 @@ static void snd_hda_generate_beep(struct work_struct *work)
		* The tone frequency of beep generator on IDT/STAC codecs is
		* defined from the 8bit tone parameter, in Hz,
		* freq = 48000 * (257 - tone) / 1024
		* that is from 12kHz to 93.75kHz in step of 46.875 hz
		* that is from 12kHz to 93.75Hz in steps of 46.875 Hz
		*/
		static int beep_linear_tone(struct hda_beep *beep, int hz)
		{
		if (hz <= 0)
		return 0;
		hz = 1000; / fixed point */
		hz = hz - DIGBEEP_HZ_MIN;
		hz = hz - DIGBEEP_HZ_MIN
		+ DIGBEEP_HZ_STEP / 2; /* round to nearest step */
		if (hz < 0)
		hz = 0; /* turn off PC beep*/
		else if (hz >= (DIGBEEP_HZ_MAX - DIGBEEP_HZ_MIN))
		hz = 0xff;
		hz = 1; /* max frequency */
		else {
		hz /= DIGBEEP_HZ_STEP;
		hz++;
		hz = 255 - hz;
		}
		return hz;
		}

sound/pci/hda/hda_intel.c

+24 −10

Original line number	Diff line number	Diff line
		@@ -1470,6 +1470,17 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
		return err;
		}
		snd_pcm_limit_hw_rates(runtime);
		/* sanity check */
		if (snd_BUG_ON(!runtime->hw.channels_min) \|\|
		snd_BUG_ON(!runtime->hw.channels_max) \|\|
		snd_BUG_ON(!runtime->hw.formats) \|\|
		snd_BUG_ON(!runtime->hw.rates)) {
		azx_release_device(azx_dev);
		hinfo->ops.close(hinfo, apcm->codec, substream);
		snd_hda_power_down(apcm->codec);
		mutex_unlock(&chip->open_mutex);
		return -EINVAL;
		}
		spin_lock_irqsave(&chip->reg_lock, flags);
		azx_dev->substream = substream;
		azx_dev->running = 0;
		@@ -1478,13 +1489,6 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
		runtime->private_data = azx_dev;
		snd_pcm_set_sync(substream);
		mutex_unlock(&chip->open_mutex);

		if (snd_BUG_ON(!runtime->hw.channels_min \|\| !runtime->hw.channels_max))
		return -EINVAL;
		if (snd_BUG_ON(!runtime->hw.formats))
		return -EINVAL;
		if (snd_BUG_ON(!runtime->hw.rates))
		return -EINVAL;
		return 0;
		}

		@@ -2344,9 +2348,19 @@ static int __devinit azx_create(struct snd_card card, struct pci_dev pci,
		gcap = azx_readw(chip, GCAP);
		snd_printdd(SFX "chipset global capabilities = 0x%x\n", gcap);

		/* ATI chips seems buggy about 64bit DMA addresses */
		if (chip->driver_type == AZX_DRIVER_ATI)
		/* disable SB600 64bit support for safety */
		if ((chip->driver_type == AZX_DRIVER_ATI) \|\|
		(chip->driver_type == AZX_DRIVER_ATIHDMI)) {
		struct pci_dev *p_smbus;
		p_smbus = pci_get_device(PCI_VENDOR_ID_ATI,
		PCI_DEVICE_ID_ATI_SBX00_SMBUS,
		NULL);
		if (p_smbus) {
		if (p_smbus->revision < 0x30)
		gcap &= ~ICH6_GCAP_64OK;
		pci_dev_put(p_smbus);
		}
		}

		/* allow 64bit DMA address if supported by H/W */
		if ((gcap & ICH6_GCAP_64OK) && !pci_set_dma_mask(pci, DMA_BIT_MASK(64)))

sound/pci/hda/patch_realtek.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -7166,9 +7166,6 @@ static struct hda_verb alc882_targa_verbs[] = {
		{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */

		{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT \| AC_USRSP_EN},
		{0x01, AC_VERB_SET_GPIO_MASK, 0x03},
		{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x03},
		{0x01, AC_VERB_SET_GPIO_DATA, 0x03},
		{ } /* end */
		};

		@@ -8691,7 +8688,8 @@ static struct alc_config_preset alc882_presets[] = {
		},
		[ALC883_TARGA_DIG] = {
		.mixers = { alc883_targa_mixer, alc883_chmode_mixer },
		.init_verbs = { alc883_init_verbs, alc883_targa_verbs},
		.init_verbs = { alc883_init_verbs, alc880_gpio3_init_verbs,
		alc883_targa_verbs},
		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
		.dac_nids = alc883_dac_nids,
		.dig_out_nid = ALC883_DIGOUT_NID,
		@@ -8704,7 +8702,8 @@ static struct alc_config_preset alc882_presets[] = {
		},
		[ALC883_TARGA_2ch_DIG] = {
		.mixers = { alc883_targa_2ch_mixer},
		.init_verbs = { alc883_init_verbs, alc883_targa_verbs},
		.init_verbs = { alc883_init_verbs, alc880_gpio3_init_verbs,
		alc883_targa_verbs},
		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
		.dac_nids = alc883_dac_nids,
		.adc_nids = alc883_adc_nids_alt,
		@@ -12431,9 +12430,9 @@ static struct snd_kcontrol_new alc269_lifebook_mixer[] = {

		static struct snd_kcontrol_new alc269_eeepc_mixer[] = {
		HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
		HDA_CODEC_MUTE("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
		HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
		HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
		HDA_CODEC_MUTE("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),
		HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),
		{ } /* end */
		};

sound/pci/hda/patch_via.c

+51 −38

Original line number	Diff line number	Diff line
		@@ -210,7 +210,9 @@ struct via_spec {
		/* capture */
		unsigned int num_adc_nids;
		hda_nid_t *adc_nids;
		hda_nid_t mux_nids[3];
		hda_nid_t dig_in_nid;
		hda_nid_t dig_in_pin;

		/* capture source */
		const struct hda_input_mux *input_mux;
		@@ -319,6 +321,9 @@ static void via_auto_set_output_and_unmute(struct hda_codec *codec,
		pin_type);
		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
		AMP_OUT_UNMUTE);
		if (snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_EAPD)
		snd_hda_codec_write(codec, nid, 0,
		AC_VERB_SET_EAPD_BTLENABLE, 0x02);
		}


		@@ -387,26 +392,11 @@ static int via_mux_enum_put(struct snd_kcontrol *kcontrol,
		struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
		struct via_spec *spec = codec->spec;
		unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
		unsigned int vendor_id = codec->vendor_id;

		/* AIW0 lydia 060801 add for correct sw0 input select */
		if (IS_VT1708_VENDORID(vendor_id) && (adc_idx == 0))
		return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
		0x18, &spec->cur_mux[adc_idx]);
		else if ((IS_VT1709_10CH_VENDORID(vendor_id) \|\|
		IS_VT1709_6CH_VENDORID(vendor_id)) && (adc_idx == 0))
		return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
		0x19, &spec->cur_mux[adc_idx]);
		else if ((IS_VT1708B_8CH_VENDORID(vendor_id) \|\|
		IS_VT1708B_4CH_VENDORID(vendor_id)) && (adc_idx == 0))
		return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
		0x17, &spec->cur_mux[adc_idx]);
		else if (IS_VT1702_VENDORID(vendor_id) && (adc_idx == 0))
		return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
		0x13, &spec->cur_mux[adc_idx]);
		else
		if (!spec->mux_nids[adc_idx])
		return -EINVAL;
		return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
		spec->adc_nids[adc_idx],
		spec->mux_nids[adc_idx],
		&spec->cur_mux[adc_idx]);
		}

		@@ -998,25 +988,11 @@ static int via_init(struct hda_codec *codec)

		/* Lydia Add for EAPD enable */
		if (!spec->dig_in_nid) { /* No Digital In connection */
		if (IS_VT1708_VENDORID(codec->vendor_id)) {
		snd_hda_codec_write(codec, VT1708_DIGIN_PIN, 0,
		AC_VERB_SET_PIN_WIDGET_CONTROL,
		PIN_OUT);
		snd_hda_codec_write(codec, VT1708_DIGIN_PIN, 0,
		AC_VERB_SET_EAPD_BTLENABLE, 0x02);
		} else if (IS_VT1709_10CH_VENDORID(codec->vendor_id) \|\|
		IS_VT1709_6CH_VENDORID(codec->vendor_id)) {
		snd_hda_codec_write(codec, VT1709_DIGIN_PIN, 0,
		AC_VERB_SET_PIN_WIDGET_CONTROL,
		PIN_OUT);
		snd_hda_codec_write(codec, VT1709_DIGIN_PIN, 0,
		AC_VERB_SET_EAPD_BTLENABLE, 0x02);
		} else if (IS_VT1708B_8CH_VENDORID(codec->vendor_id) \|\|
		IS_VT1708B_4CH_VENDORID(codec->vendor_id)) {
		snd_hda_codec_write(codec, VT1708B_DIGIN_PIN, 0,
		if (spec->dig_in_pin) {
		snd_hda_codec_write(codec, spec->dig_in_pin, 0,
		AC_VERB_SET_PIN_WIDGET_CONTROL,
		PIN_OUT);
		snd_hda_codec_write(codec, VT1708B_DIGIN_PIN, 0,
		snd_hda_codec_write(codec, spec->dig_in_pin, 0,
		AC_VERB_SET_EAPD_BTLENABLE, 0x02);
		}
		} else /* enable SPDIF-input pin */
		@@ -1326,6 +1302,7 @@ static int vt1708_parse_auto_config(struct hda_codec *codec)

		if (spec->autocfg.dig_outs)
		spec->multiout.dig_out_nid = VT1708_DIGOUT_NID;
		spec->dig_in_pin = VT1708_DIGIN_PIN;
		if (spec->autocfg.dig_in_pin)
		spec->dig_in_nid = VT1708_DIGIN_NID;

		@@ -1352,6 +1329,34 @@ static int via_auto_init(struct hda_codec *codec)
		return 0;
		}

		static int get_mux_nids(struct hda_codec *codec)
		{
		struct via_spec *spec = codec->spec;
		hda_nid_t nid, conn[8];
		unsigned int type;
		int i, n;

		for (i = 0; i < spec->num_adc_nids; i++) {
		nid = spec->adc_nids[i];
		while (nid) {
		type = (get_wcaps(codec, nid) & AC_WCAP_TYPE)
		>> AC_WCAP_TYPE_SHIFT;
		if (type == AC_WID_PIN)
		break;
		n = snd_hda_get_connections(codec, nid, conn,
		ARRAY_SIZE(conn));
		if (n <= 0)
		break;
		if (n > 1) {
		spec->mux_nids[i] = nid;
		break;
		}
		nid = conn[0];
		}
		}
		return 0;
		}

		static int patch_vt1708(struct hda_codec *codec)
		{
		struct via_spec *spec;
		@@ -1799,6 +1804,7 @@ static int vt1709_parse_auto_config(struct hda_codec *codec)

		if (spec->autocfg.dig_outs)
		spec->multiout.dig_out_nid = VT1709_DIGOUT_NID;
		spec->dig_in_pin = VT1709_DIGIN_PIN;
		if (spec->autocfg.dig_in_pin)
		spec->dig_in_nid = VT1709_DIGIN_NID;

		@@ -1859,6 +1865,7 @@ static int patch_vt1709_10ch(struct hda_codec *codec)
		if (!spec->adc_nids && spec->input_mux) {
		spec->adc_nids = vt1709_adc_nids;
		spec->num_adc_nids = ARRAY_SIZE(vt1709_adc_nids);
		get_mux_nids(codec);
		spec->mixers[spec->num_mixers] = vt1709_capture_mixer;
		spec->num_mixers++;
		}
		@@ -1952,6 +1959,7 @@ static int patch_vt1709_6ch(struct hda_codec *codec)
		if (!spec->adc_nids && spec->input_mux) {
		spec->adc_nids = vt1709_adc_nids;
		spec->num_adc_nids = ARRAY_SIZE(vt1709_adc_nids);
		get_mux_nids(codec);
		spec->mixers[spec->num_mixers] = vt1709_capture_mixer;
		spec->num_mixers++;
		}
		@@ -2344,6 +2352,7 @@ static int vt1708B_parse_auto_config(struct hda_codec *codec)

		if (spec->autocfg.dig_outs)
		spec->multiout.dig_out_nid = VT1708B_DIGOUT_NID;
		spec->dig_in_pin = VT1708B_DIGIN_PIN;
		if (spec->autocfg.dig_in_pin)
		spec->dig_in_nid = VT1708B_DIGIN_NID;

		@@ -2404,6 +2413,7 @@ static int patch_vt1708B_8ch(struct hda_codec *codec)
		if (!spec->adc_nids && spec->input_mux) {
		spec->adc_nids = vt1708B_adc_nids;
		spec->num_adc_nids = ARRAY_SIZE(vt1708B_adc_nids);
		get_mux_nids(codec);
		spec->mixers[spec->num_mixers] = vt1708B_capture_mixer;
		spec->num_mixers++;
		}
		@@ -2455,6 +2465,7 @@ static int patch_vt1708B_4ch(struct hda_codec *codec)
		if (!spec->adc_nids && spec->input_mux) {
		spec->adc_nids = vt1708B_adc_nids;
		spec->num_adc_nids = ARRAY_SIZE(vt1708B_adc_nids);
		get_mux_nids(codec);
		spec->mixers[spec->num_mixers] = vt1708B_capture_mixer;
		spec->num_mixers++;
		}
		@@ -2889,6 +2900,7 @@ static int patch_vt1708S(struct hda_codec *codec)
		if (!spec->adc_nids && spec->input_mux) {
		spec->adc_nids = vt1708S_adc_nids;
		spec->num_adc_nids = ARRAY_SIZE(vt1708S_adc_nids);
		get_mux_nids(codec);
		spec->mixers[spec->num_mixers] = vt1708S_capture_mixer;
		spec->num_mixers++;
		}
		@@ -3206,6 +3218,7 @@ static int patch_vt1702(struct hda_codec *codec)
		if (!spec->adc_nids && spec->input_mux) {
		spec->adc_nids = vt1702_adc_nids;
		spec->num_adc_nids = ARRAY_SIZE(vt1702_adc_nids);
		get_mux_nids(codec);
		spec->mixers[spec->num_mixers] = vt1702_capture_mixer;
		spec->num_mixers++;
		}