Commit b7c15e4a 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-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Fix initialization for HP 2011 notebooks
  ALSA: hda - Add support for VMware controller
  ALSA: hda - consitify string arrays
  ALSA: hda - Add add multi-streaming playback for AD1988
  ASoC: EP93xx: fixed LRCLK rate and DMA oper. in I2S code
  ASoC: WM8990: msleep() takes milliseconds not jiffies
  ALSA : au88x0 - Limit number of channels to fix Oops via OSS emu
  ALSA: constify functions in ac97
  ASoC: WL1273 FM radio: Fix breakage with MFD API changes
  ALSA: hda - More coverage for odd-number channels elimination for HDMI
  ALSA: hda - Store PCM parameters properly in HDMI open callback
  ALSA: hda - Rearrange fixup struct in patch_realtek.c
  ALSA: oxygen: Xonar DG: fix CS4245 register writes
  ALSA: hda - Suppress the odd number of channels for HDMI
  ALSA: hda - Add fixup-call in init callback
  ALSA: hda - Reorganize fixup structure for Realtek
  ALSA: hda - Apply Sony VAIO hweq fixup only once
  ALSA: hda - Apply mario fixup only once
  ALSA: hda - Remove unused fixup entry for ALC262
parents 6a7f6ec9 27de094f

include/sound/ac97_codec.h

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ struct snd_ac97_template { 


struct snd_ac97 {

	/* -- lowlevel (hardware) driver specific -- */

	struct snd_ac97_build_ops * build_ops;

	const struct snd_ac97_build_ops *build_ops;

	void *private_data;

	void (*private_free) (struct snd_ac97 *ac97);

	/* --- */

sound/pci/ac97/ac97_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -1961,7 +1961,7 @@ static int snd_ac97_dev_disconnect(struct snd_device *device) 
}



/* build_ops to do nothing */

static struct snd_ac97_build_ops null_build_ops;

static const struct snd_ac97_build_ops null_build_ops;



#ifdef CONFIG_SND_AC97_POWER_SAVE

static void do_update_power(struct work_struct *work)

sound/pci/ac97/ac97_patch.c

+31 −31
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spdif(struct snd_ac97 *ac97) 
	return 0;

}



static struct snd_ac97_build_ops patch_yamaha_ymf743_ops = {

static const struct snd_ac97_build_ops patch_yamaha_ymf743_ops = {

	.build_spdif	= patch_yamaha_ymf743_build_spdif,

	.build_3d	= patch_yamaha_ymf7x3_3d,

};
@@ -455,7 +455,7 @@ static int patch_yamaha_ymf753_post_spdif(struct snd_ac97 * ac97) 
	return 0;

}



static struct snd_ac97_build_ops patch_yamaha_ymf753_ops = {

static const struct snd_ac97_build_ops patch_yamaha_ymf753_ops = {

	.build_3d	= patch_yamaha_ymf7x3_3d,

	.build_post_spdif = patch_yamaha_ymf753_post_spdif

};
@@ -502,7 +502,7 @@ static int patch_wolfson_wm9703_specific(struct snd_ac97 * ac97) 
	return 0;

}



static struct snd_ac97_build_ops patch_wolfson_wm9703_ops = {

static const struct snd_ac97_build_ops patch_wolfson_wm9703_ops = {

	.build_specific = patch_wolfson_wm9703_specific,

};
@@ -533,7 +533,7 @@ static int patch_wolfson_wm9704_specific(struct snd_ac97 * ac97) 
	return 0;

}



static struct snd_ac97_build_ops patch_wolfson_wm9704_ops = {

static const struct snd_ac97_build_ops patch_wolfson_wm9704_ops = {

	.build_specific = patch_wolfson_wm9704_specific,

};
@@ -677,7 +677,7 @@ static int patch_wolfson_wm9711_specific(struct snd_ac97 * ac97) 
	return 0;

}



static struct snd_ac97_build_ops patch_wolfson_wm9711_ops = {

static const struct snd_ac97_build_ops patch_wolfson_wm9711_ops = {

	.build_specific = patch_wolfson_wm9711_specific,

};
@@ -871,7 +871,7 @@ static void patch_wolfson_wm9713_resume (struct snd_ac97 * ac97) 
}

#endif



static struct snd_ac97_build_ops patch_wolfson_wm9713_ops = {

static const struct snd_ac97_build_ops patch_wolfson_wm9713_ops = {

	.build_specific = patch_wolfson_wm9713_specific,

	.build_3d = patch_wolfson_wm9713_3d,

#ifdef CONFIG_PM
@@ -976,7 +976,7 @@ static int patch_sigmatel_stac97xx_specific(struct snd_ac97 * ac97) 
	return 0;

}



static struct snd_ac97_build_ops patch_sigmatel_stac9700_ops = {

static const struct snd_ac97_build_ops patch_sigmatel_stac9700_ops = {

	.build_3d	= patch_sigmatel_stac9700_3d,

	.build_specific	= patch_sigmatel_stac97xx_specific

};
@@ -1023,7 +1023,7 @@ static int patch_sigmatel_stac9708_specific(struct snd_ac97 *ac97) 
	return patch_sigmatel_stac97xx_specific(ac97);

}



static struct snd_ac97_build_ops patch_sigmatel_stac9708_ops = {

static const struct snd_ac97_build_ops patch_sigmatel_stac9708_ops = {

	.build_3d	= patch_sigmatel_stac9708_3d,

	.build_specific	= patch_sigmatel_stac9708_specific

};
@@ -1252,7 +1252,7 @@ static int patch_sigmatel_stac9758_specific(struct snd_ac97 *ac97) 
	return 0;

}



static struct snd_ac97_build_ops patch_sigmatel_stac9758_ops = {

static const struct snd_ac97_build_ops patch_sigmatel_stac9758_ops = {

	.build_3d	= patch_sigmatel_stac9700_3d,

	.build_specific	= patch_sigmatel_stac9758_specific

};
@@ -1327,7 +1327,7 @@ static int patch_cirrus_build_spdif(struct snd_ac97 * ac97) 
	return 0;

}



static struct snd_ac97_build_ops patch_cirrus_ops = {

static const struct snd_ac97_build_ops patch_cirrus_ops = {

	.build_spdif = patch_cirrus_build_spdif

};
@@ -1384,7 +1384,7 @@ static int patch_conexant_build_spdif(struct snd_ac97 * ac97) 
	return 0;

}



static struct snd_ac97_build_ops patch_conexant_ops = {

static const struct snd_ac97_build_ops patch_conexant_ops = {

	.build_spdif = patch_conexant_build_spdif

};
@@ -1560,7 +1560,7 @@ static void patch_ad1881_chained(struct snd_ac97 * ac97, int unchained_idx, int 
	}

}



static struct snd_ac97_build_ops patch_ad1881_build_ops = {

static const struct snd_ac97_build_ops patch_ad1881_build_ops = {

#ifdef CONFIG_PM

	.resume = ad18xx_resume

#endif
@@ -1647,7 +1647,7 @@ static int patch_ad1885_specific(struct snd_ac97 * ac97) 
	return 0;

}



static struct snd_ac97_build_ops patch_ad1885_build_ops = {

static const struct snd_ac97_build_ops patch_ad1885_build_ops = {

	.build_specific = &patch_ad1885_specific,

#ifdef CONFIG_PM

	.resume = ad18xx_resume
@@ -1674,7 +1674,7 @@ static int patch_ad1886_specific(struct snd_ac97 * ac97) 
	return 0;

}



static struct snd_ac97_build_ops patch_ad1886_build_ops = {

static const struct snd_ac97_build_ops patch_ad1886_build_ops = {

	.build_specific = &patch_ad1886_specific,

#ifdef CONFIG_PM

	.resume = ad18xx_resume
@@ -1881,7 +1881,7 @@ static int patch_ad1981a_specific(struct snd_ac97 * ac97) 
				    ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));

}



static struct snd_ac97_build_ops patch_ad1981a_build_ops = {

static const struct snd_ac97_build_ops patch_ad1981a_build_ops = {

	.build_post_spdif = patch_ad198x_post_spdif,

	.build_specific = patch_ad1981a_specific,

#ifdef CONFIG_PM
@@ -1936,7 +1936,7 @@ static int patch_ad1981b_specific(struct snd_ac97 *ac97) 
				    ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));

}



static struct snd_ac97_build_ops patch_ad1981b_build_ops = {

static const struct snd_ac97_build_ops patch_ad1981b_build_ops = {

	.build_post_spdif = patch_ad198x_post_spdif,

	.build_specific = patch_ad1981b_specific,

#ifdef CONFIG_PM
@@ -2075,7 +2075,7 @@ static int patch_ad1888_specific(struct snd_ac97 *ac97) 
	return patch_build_controls(ac97, snd_ac97_ad1888_controls, ARRAY_SIZE(snd_ac97_ad1888_controls));

}



static struct snd_ac97_build_ops patch_ad1888_build_ops = {

static const struct snd_ac97_build_ops patch_ad1888_build_ops = {

	.build_post_spdif = patch_ad198x_post_spdif,

	.build_specific = patch_ad1888_specific,

#ifdef CONFIG_PM
@@ -2124,7 +2124,7 @@ static int patch_ad1980_specific(struct snd_ac97 *ac97) 
	return patch_build_controls(ac97, &snd_ac97_ad198x_2cmic, 1);

}



static struct snd_ac97_build_ops patch_ad1980_build_ops = {

static const struct snd_ac97_build_ops patch_ad1980_build_ops = {

	.build_post_spdif = patch_ad198x_post_spdif,

	.build_specific = patch_ad1980_specific,

#ifdef CONFIG_PM
@@ -2239,7 +2239,7 @@ static int patch_ad1985_specific(struct snd_ac97 *ac97) 
				    ARRAY_SIZE(snd_ac97_ad1985_controls));

}



static struct snd_ac97_build_ops patch_ad1985_build_ops = {

static const struct snd_ac97_build_ops patch_ad1985_build_ops = {

	.build_post_spdif = patch_ad198x_post_spdif,

	.build_specific = patch_ad1985_specific,

#ifdef CONFIG_PM
@@ -2531,7 +2531,7 @@ static int patch_ad1986_specific(struct snd_ac97 *ac97) 
				    ARRAY_SIZE(snd_ac97_ad1985_controls));

}



static struct snd_ac97_build_ops patch_ad1986_build_ops = {

static const struct snd_ac97_build_ops patch_ad1986_build_ops = {

	.build_post_spdif = patch_ad198x_post_spdif,

	.build_specific = patch_ad1986_specific,

#ifdef CONFIG_PM
@@ -2636,7 +2636,7 @@ static int patch_alc650_specific(struct snd_ac97 * ac97) 
	return 0;

}



static struct snd_ac97_build_ops patch_alc650_ops = {

static const struct snd_ac97_build_ops patch_alc650_ops = {

	.build_specific	= patch_alc650_specific,

	.update_jacks = alc650_update_jacks

};
@@ -2788,7 +2788,7 @@ static int patch_alc655_specific(struct snd_ac97 * ac97) 
	return 0;

}



static struct snd_ac97_build_ops patch_alc655_ops = {

static const struct snd_ac97_build_ops patch_alc655_ops = {

	.build_specific	= patch_alc655_specific,

	.update_jacks = alc655_update_jacks

};
@@ -2900,7 +2900,7 @@ static int patch_alc850_specific(struct snd_ac97 *ac97) 
	return 0;

}



static struct snd_ac97_build_ops patch_alc850_ops = {

static const struct snd_ac97_build_ops patch_alc850_ops = {

	.build_specific	= patch_alc850_specific,

	.update_jacks = alc850_update_jacks

};
@@ -2962,7 +2962,7 @@ static int patch_cm9738_specific(struct snd_ac97 * ac97) 
	return patch_build_controls(ac97, snd_ac97_cm9738_controls, ARRAY_SIZE(snd_ac97_cm9738_controls));

}



static struct snd_ac97_build_ops patch_cm9738_ops = {

static const struct snd_ac97_build_ops patch_cm9738_ops = {

	.build_specific	= patch_cm9738_specific,

	.update_jacks = cm9738_update_jacks

};
@@ -3053,7 +3053,7 @@ static int patch_cm9739_post_spdif(struct snd_ac97 * ac97) 
	return patch_build_controls(ac97, snd_ac97_cm9739_controls_spdif, ARRAY_SIZE(snd_ac97_cm9739_controls_spdif));

}



static struct snd_ac97_build_ops patch_cm9739_ops = {

static const struct snd_ac97_build_ops patch_cm9739_ops = {

	.build_specific	= patch_cm9739_specific,

	.build_post_spdif = patch_cm9739_post_spdif,

	.update_jacks = cm9739_update_jacks
@@ -3227,7 +3227,7 @@ static int patch_cm9761_specific(struct snd_ac97 * ac97) 
	return patch_build_controls(ac97, snd_ac97_cm9761_controls, ARRAY_SIZE(snd_ac97_cm9761_controls));

}



static struct snd_ac97_build_ops patch_cm9761_ops = {

static const struct snd_ac97_build_ops patch_cm9761_ops = {

	.build_specific	= patch_cm9761_specific,

	.build_post_spdif = patch_cm9761_post_spdif,

	.update_jacks = cm9761_update_jacks
@@ -3323,7 +3323,7 @@ static int patch_cm9780_specific(struct snd_ac97 *ac97) 
	return patch_build_controls(ac97, cm9780_controls, ARRAY_SIZE(cm9780_controls));

}



static struct snd_ac97_build_ops patch_cm9780_ops = {

static const struct snd_ac97_build_ops patch_cm9780_ops = {

	.build_specific	= patch_cm9780_specific,

	.build_post_spdif = patch_cm9761_post_spdif	/* identical with CM9761 */

};
@@ -3443,7 +3443,7 @@ static int patch_vt1616_specific(struct snd_ac97 * ac97) 
	return 0;

}



static struct snd_ac97_build_ops patch_vt1616_ops = {

static const struct snd_ac97_build_ops patch_vt1616_ops = {

	.build_specific	= patch_vt1616_specific

};
@@ -3797,7 +3797,7 @@ static int patch_it2646_specific(struct snd_ac97 * ac97) 
	return 0;

}



static struct snd_ac97_build_ops patch_it2646_ops = {

static const struct snd_ac97_build_ops patch_it2646_ops = {

	.build_specific	= patch_it2646_specific,

	.update_jacks = it2646_update_jacks

};
@@ -3831,7 +3831,7 @@ static int patch_si3036_specific(struct snd_ac97 * ac97) 
	return 0;

}



static struct snd_ac97_build_ops patch_si3036_ops = {

static const struct snd_ac97_build_ops patch_si3036_ops = {

	.build_specific	= patch_si3036_specific,

};
@@ -3898,7 +3898,7 @@ static int patch_ucb1400_specific(struct snd_ac97 * ac97) 
	return 0;

}



static struct snd_ac97_build_ops patch_ucb1400_ops = {

static const struct snd_ac97_build_ops patch_ucb1400_ops = {

	.build_specific	= patch_ucb1400_specific,

};

sound/pci/au88x0/au88x0_pcm.c

+20 −4
Original line number Diff line number Diff line
@@ -42,11 +42,7 @@ static struct snd_pcm_hardware snd_vortex_playback_hw_adb = { 
	.rate_min = 5000,

	.rate_max = 48000,

	.channels_min = 1,

#ifdef CHIP_AU8830

	.channels_max = 4,

#else

	.channels_max = 2,

#endif

	.buffer_bytes_max = 0x10000,

	.period_bytes_min = 0x1,

	.period_bytes_max = 0x1000,
@@ -115,6 +111,17 @@ static struct snd_pcm_hardware snd_vortex_playback_hw_wt = { 
	.periods_max = 64,

};

#endif

#ifdef CHIP_AU8830

static unsigned int au8830_channels[3] = {

	1, 2, 4,

};



static struct snd_pcm_hw_constraint_list hw_constraints_au8830_channels = {

	.count = ARRAY_SIZE(au8830_channels),

	.list = au8830_channels,

	.mask = 0,

};

#endif

/* open callback */

static int snd_vortex_pcm_open(struct snd_pcm_substream *substream)

{
@@ -156,6 +163,15 @@ static int snd_vortex_pcm_open(struct snd_pcm_substream *substream) 
		if (VORTEX_PCM_TYPE(substream->pcm) == VORTEX_PCM_ADB

		    || VORTEX_PCM_TYPE(substream->pcm) == VORTEX_PCM_I2S)

			runtime->hw = snd_vortex_playback_hw_adb;

#ifdef CHIP_AU8830

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&

			VORTEX_PCM_TYPE(substream->pcm) == VORTEX_PCM_ADB) {

			runtime->hw.channels_max = 4;

			snd_pcm_hw_constraint_list(runtime, 0,

				SNDRV_PCM_HW_PARAM_CHANNELS,

				&hw_constraints_au8830_channels);

		}

#endif

		substream->runtime->private_data = NULL;

	}

#ifndef CHIP_AU8810

sound/pci/hda/hda_codec.c

+5 −5
Original line number Diff line number Diff line
@@ -2134,10 +2134,10 @@ int snd_hda_codec_reset(struct hda_codec *codec) 
 * This function returns zero if successful or a negative error code.

 */

int snd_hda_add_vmaster(struct hda_codec *codec, char *name,

			unsigned int *tlv, const char **slaves)

			unsigned int *tlv, const char * const *slaves)

{

	struct snd_kcontrol *kctl;

	const char **s;

	const char * const *s;

	int err;



	for (s = slaves; *s && !snd_hda_find_mixer_ctl(codec, *s); s++)
@@ -3689,7 +3689,7 @@ EXPORT_SYMBOL_HDA(snd_hda_build_pcms); 
 * If no entries are matching, the function returns a negative value.

 */

int snd_hda_check_board_config(struct hda_codec *codec,

			       int num_configs, const char **models,

			       int num_configs, const char * const *models,

			       const struct snd_pci_quirk *tbl)

{

	if (codec->modelname && models) {
@@ -3753,7 +3753,7 @@ EXPORT_SYMBOL_HDA(snd_hda_check_board_config); 
 * If no entries are matching, the function returns a negative value.

 */

int snd_hda_check_board_codec_sid_config(struct hda_codec *codec,

			       int num_configs, const char **models,

			       int num_configs, const char * const *models,

			       const struct snd_pci_quirk *tbl)

{

	const struct snd_pci_quirk *q;
@@ -4690,7 +4690,7 @@ const char *hda_get_input_pin_label(struct hda_codec *codec, hda_nid_t pin, 
					int check_location)

{

	unsigned int def_conf;

	static const char *mic_names[] = {

	static const char * const mic_names[] = {

		"Internal Mic", "Dock Mic", "Mic", "Front Mic", "Rear Mic",

	};

	int attr;

CRA Git | Maintained and supported by SUSTech CRA and CCSE