Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae445b91 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 - Allow all formats as default for Nvidia HDMI
  ALSA: aaci: ARM1176 aaci-pl041 AC97 register read timeout
  ALSA: hda - Fix volume-knob setup for Dell laptops with STAC9228
  ALSA: hda - Fix mute sound with STAC9227/9228 codecs
  ALSA: bt87x - Add a whitelist for Pinnacle PCTV (11bd:0012)
  ALSA: hda - Fix overflow of spec->init_verbs in patch_realtek.c
  ALSA: ice1724 - Make call to set hw params succeed on ESI Juli@
  ALSA: ice1724: Fix surround on Chaintech AV-710
  ALSA: hda - Add full rates/formats support for Nvidia HDMI
parents 54753fdb fb66ebd8

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ STAC9227/9228/9229/927x 
  5stack-no-fp	D965 5stack without front panel

  dell-3stack	Dell Dimension E520

  dell-bios	Fixes with Dell BIOS setup

  volknob	Fixes with volume-knob widget 0x24

  auto		BIOS setup (default)



STAC92HD71B*

sound/arm/aaci.c

+1 −0
Original line number Diff line number Diff line
@@ -937,6 +937,7 @@ static int __devinit aaci_probe_ac97(struct aaci *aaci) 
	struct snd_ac97 *ac97;

	int ret;



	writel(0, aaci->base + AC97_POWERDOWN);

	/*

	 * Assert AACIRESET for 2us

	 */

sound/pci/bt87x.c

+2 −0
Original line number Diff line number Diff line
@@ -808,6 +808,8 @@ static struct pci_device_id snd_bt87x_ids[] = { 
	BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x1002, 0x0001, GENERIC),

	/* Leadtek Winfast tv 2000xp delux */

	BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x107d, 0x6606, GENERIC),

	/* Pinnacle PCTV */

	BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x11bd, 0x0012, GENERIC),

	/* Voodoo TV 200 */

	BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x121a, 0x3000, GENERIC),

	/* Askey Computer Corp. MagicTView'99 */

sound/pci/hda/patch_nvhdmi.c

+25 −6
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ 
#include "hda_codec.h"

#include "hda_local.h"



/* define below to restrict the supported rates and formats */

/* #define LIMITED_RATE_FMT_SUPPORT */



struct nvhdmi_spec {

	struct hda_multi_out multiout;
@@ -60,6 +63,22 @@ static struct hda_verb nvhdmi_basic_init[] = { 
	{} /* terminator */

};



#ifdef LIMITED_RATE_FMT_SUPPORT

/* support only the safe format and rate */

#define SUPPORTED_RATES		SNDRV_PCM_RATE_48000

#define SUPPORTED_MAXBPS	16

#define SUPPORTED_FORMATS	SNDRV_PCM_FMTBIT_S16_LE

#else

/* support all rates and formats */

#define SUPPORTED_RATES \

	(SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\

	SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |\

	 SNDRV_PCM_RATE_192000)

#define SUPPORTED_MAXBPS	24

#define SUPPORTED_FORMATS \

	(SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE)

#endif



/*

 * Controls

 */
@@ -258,9 +277,9 @@ static struct hda_pcm_stream nvhdmi_pcm_digital_playback_8ch = { 
	.channels_min = 2,

	.channels_max = 8,

	.nid = Nv_Master_Convert_nid,

	.rates = SNDRV_PCM_RATE_48000,

	.maxbps = 16,

	.formats = SNDRV_PCM_FMTBIT_S16_LE,

	.rates = SUPPORTED_RATES,

	.maxbps = SUPPORTED_MAXBPS,

	.formats = SUPPORTED_FORMATS,

	.ops = {

		.open = nvhdmi_dig_playback_pcm_open,

		.close = nvhdmi_dig_playback_pcm_close_8ch,
@@ -273,9 +292,9 @@ static struct hda_pcm_stream nvhdmi_pcm_digital_playback_2ch = { 
	.channels_min = 2,

	.channels_max = 2,

	.nid = Nv_Master_Convert_nid,

	.rates = SNDRV_PCM_RATE_48000,

	.maxbps = 16,

	.formats = SNDRV_PCM_FMTBIT_S16_LE,

	.rates = SUPPORTED_RATES,

	.maxbps = SUPPORTED_MAXBPS,

	.formats = SUPPORTED_FORMATS,

	.ops = {

		.open = nvhdmi_dig_playback_pcm_open,

		.close = nvhdmi_dig_playback_pcm_close_2ch,

sound/pci/hda/patch_realtek.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ struct alc_spec { 
	struct snd_kcontrol_new *cap_mixer;	/* capture mixer */

	unsigned int beep_amp;	/* beep amp value, set via set_beep_amp() */













	const struct hda_verb *init_verbs[5];	/* initialization verbs













	const struct hda_verb *init_verbs[10];	/* initialization verbs















						 * don't forget NULL















						 * termination!















						 */