Commit b2409fb6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (24 commits)
  ALSA: hda/realtek - Skip invalid digital out pins
  ALSA: hda/sigmatel - Automatically retrieve digital I/O widgets
  ALSA: hda - Remove unused variables
  ALSA: hda/realtek - Don't create alt-stream for capture when unnecessary
  ALSA: hda - Add support for 92HD65 / 92HD66 family of codecs
  ALSA: hda - Disable power-widget control for IDT 92HD83/93 as default
  ALSA: hda - Check NO_PRESENCE pincfg default bit
  ASoC: Ensure we always delay for WM8962 FLL when starting from SYSCLK
  ASoC: Ensure the WM8962 oscillator and PLLs start up disabled
  ASoC: Ensure WM8962 PLL registers are reset
  ALSA: intel8x0 - Fix inclusion of kvm_para.h
  ALSA: hda_hwdep: Fix possible buffer overflow
  ASoC: Fix return value of wm5100_gpio_direction_out()
  ASoC: WM8904: Set `invert' bit for Capture Switch
  ASoC: Leave input audio data bit length settings untouched in wm8711_set_dai_fmt
  ASoC: wm8711: Fix wrong mask for setting input audio data bit length select
  ALSA: intel8x0: Improve performance in virtual environment
  ALSA: hdspm - Enable all firmware ranges for PCI MADI/AES cards
  ALSA: hdsp - Correct HDSP_VERSION_BIT constant, thus partly fixing RPM detection
  ALSA: hdspm - Fix MADI channel format in the status ioctl
  ...
parents 6b1506c6 6bcbf64a

sound/core/hwdep.c

+8 −1
Original line number Diff line number Diff line
@@ -272,7 +272,14 @@ static int snd_hwdep_control_ioctl(struct snd_card *card, 
			if (get_user(device, (int __user *)arg))

				return -EFAULT;

			mutex_lock(&register_mutex);

			device = device < 0 ? 0 : device + 1;



			if (device < 0)

				device = 0;

			else if (device < SNDRV_MINOR_HWDEPS)

				device++;

			else

				device = SNDRV_MINOR_HWDEPS;



			while (device < SNDRV_MINOR_HWDEPS) {

				if (snd_hwdep_search(card, device))

					break;

sound/pci/hda/hda_hwdep.c

+0 −2
Original line number Diff line number Diff line
@@ -756,8 +756,6 @@ static int get_line_from_fw(char *buf, int size, struct firmware *fw) 
	}

	if (!fw->size)

		return 0;

	if (size < fw->size)

		size = fw->size;



	for (len = 0; len < fw->size; len++) {

		if (!*p)

sound/pci/hda/hda_local.h

+4 −0
Original line number Diff line number Diff line
@@ -442,6 +442,8 @@ struct auto_pin_cfg { 
	(cfg & AC_DEFCFG_SEQUENCE)

#define get_defcfg_device(cfg) \

	((cfg & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT)

#define get_defcfg_misc(cfg) \

	((cfg & AC_DEFCFG_MISC) >> AC_DEFCFG_MISC_SHIFT)



/* bit-flags for snd_hda_parse_pin_def_config() behavior */

#define HDA_PINCFG_NO_HP_FIXUP	(1 << 0) /* no HP-split */
@@ -509,6 +511,8 @@ int snd_hda_jack_detect(struct hda_codec *codec, hda_nid_t nid); 
static inline bool is_jack_detectable(struct hda_codec *codec, hda_nid_t nid)

{

	return (snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_PRES_DETECT) &&

		!(get_defcfg_misc(snd_hda_codec_get_pincfg(codec, nid) &

		  AC_DEFCFG_MISC_NO_PRESENCE)) &&

		(get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP);

}

sound/pci/hda/patch_hdmi.c

+1 −4
Original line number Diff line number Diff line
@@ -1006,7 +1006,6 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) 
	unsigned int caps, config;

	int pin_idx;

	struct hdmi_spec_per_pin *per_pin;

	struct hdmi_eld *eld;

	int err;



	caps = snd_hda_param_read(codec, pin_nid, AC_PAR_PIN_CAP);
@@ -1023,7 +1022,6 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) 


	pin_idx = spec->num_pins;

	per_pin = &spec->pins[pin_idx];

	eld = &per_pin->sink_eld;



	per_pin->pin_nid = pin_nid;
@@ -1576,7 +1574,7 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo, 
				     struct snd_pcm_substream *substream)

{

	int chs;

	unsigned int dataDCC1, dataDCC2, channel_id;

	unsigned int dataDCC2, channel_id;

	int i;

	struct hdmi_spec *spec = codec->spec;

	struct hda_spdif_out *spdif =
@@ -1586,7 +1584,6 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo, 


	chs = substream->runtime->channels;



	dataDCC1 = AC_DIG1_ENABLE | AC_DIG1_COPYRIGHT;

	dataDCC2 = 0x2;



	/* turn off SPDIF once; otherwise the IEC958 bits won't be updated */

sound/pci/hda/patch_realtek.c

+13 −10
Original line number Diff line number Diff line
@@ -1604,27 +1604,29 @@ static void alc_auto_init_digital(struct hda_codec *codec) 
static void alc_auto_parse_digital(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;

	int i, err;

	int i, err, nums;

	hda_nid_t dig_nid;



	/* support multiple SPDIFs; the secondary is set up as a slave */

	nums = 0;

	for (i = 0; i < spec->autocfg.dig_outs; i++) {

		hda_nid_t conn[4];

		err = snd_hda_get_connections(codec,

					      spec->autocfg.dig_out_pins[i],

					      conn, ARRAY_SIZE(conn));

		if (err < 0)

		if (err <= 0)

			continue;

		dig_nid = conn[0]; /* assume the first element is audio-out */

		if (!i) {

		if (!nums) {

			spec->multiout.dig_out_nid = dig_nid;

			spec->dig_out_type = spec->autocfg.dig_out_type[0];

		} else {

			spec->multiout.slave_dig_outs = spec->slave_dig_outs;

			if (i >= ARRAY_SIZE(spec->slave_dig_outs) - 1)

			if (nums >= ARRAY_SIZE(spec->slave_dig_outs) - 1)

				break;

			spec->slave_dig_outs[i - 1] = dig_nid;

			spec->slave_dig_outs[nums - 1] = dig_nid;

		}

		nums++;

	}



	if (spec->autocfg.dig_in_pin) {
@@ -2270,6 +2272,7 @@ static int alc_build_pcms(struct hda_codec *codec) 
	struct alc_spec *spec = codec->spec;

	struct hda_pcm *info = spec->pcm_rec;

	const struct hda_pcm_stream *p;

	bool have_multi_adcs;

	int i;



	codec->num_pcms = 1;
@@ -2348,8 +2351,11 @@ static int alc_build_pcms(struct hda_codec *codec) 
	/* If the use of more than one ADC is requested for the current

	 * model, configure a second analog capture-only PCM.

	 */

	have_multi_adcs = (spec->num_adc_nids > 1) &&

		!spec->dyn_adc_switch && !spec->auto_mic &&

		(!spec->input_mux || spec->input_mux->num_items > 1);

	/* Additional Analaog capture for index #2 */

	if (spec->alt_dac_nid || spec->num_adc_nids > 1) {

	if (spec->alt_dac_nid || have_multi_adcs) {

		codec->num_pcms = 3;

		info = spec->pcm_rec + 2;

		info->name = spec->stream_name_analog;
@@ -2365,7 +2371,7 @@ static int alc_build_pcms(struct hda_codec *codec) 
				alc_pcm_null_stream;

			info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = 0;

		}

		if (spec->num_adc_nids > 1) {

		if (have_multi_adcs) {

			p = spec->stream_analog_alt_capture;

			if (!p)

				p = &alc_pcm_analog_alt_capture;
@@ -2657,7 +2663,6 @@ static int alc_auto_fill_adc_caps(struct hda_codec *codec) 
	hda_nid_t *adc_nids = spec->private_adc_nids;

	hda_nid_t *cap_nids = spec->private_capsrc_nids;

	int max_nums = ARRAY_SIZE(spec->private_adc_nids);

	bool indep_capsrc = false;

	int i, nums = 0;



	nid = codec->start_nid;
@@ -2679,13 +2684,11 @@ static int alc_auto_fill_adc_caps(struct hda_codec *codec) 
				break;

			if (type == AC_WID_AUD_SEL) {

				cap_nids[nums] = src;

				indep_capsrc = true;

				break;

			}

			n = snd_hda_get_conn_list(codec, src, &list);

			if (n > 1) {

				cap_nids[nums] = src;

				indep_capsrc = true;

				break;

			} else if (n != 1)

				break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE