Commit 7bfeea05 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 automute on Thinkpad L412/L512
  ALSA: HDA: Fix dmesg output of HDMI supported bits
  ALSA: fix invalid hardware.h include in ac97c for AVR32 architecture
  ASoC: correct link specifications for corgi, poodle and spitz
  ASoC: Samsung: Fix outdated cpu_dai_name for s3c24xx i2s
  ASoC: Fix codec device id format used by some dai_links
  ALSA: azt3328 -  fix broken AZF_FMT_XLATE macro
  ALSA: Xonar, CS43xx: Don't overrun static array
  ASoC: Handle low measured DC offsets for wm_hubs devices
  ASoC: da8xx/omap-l1xx: match codec_name with i2c ids
  ASoC: WM8994: fix wrong value in tristate function
  ASoC: WM8995: Fix incorrect use of snd_soc_update_bits()
parents f9a3d1d7 dcc3c4c0

sound/atmel/ac97c.c

+4 −1
Original line number Diff line number Diff line
@@ -33,9 +33,12 @@ 
#include <linux/dw_dmac.h>



#include <mach/cpu.h>

#include <mach/hardware.h>

#include <mach/gpio.h>



#ifdef CONFIG_ARCH_AT91

#include <mach/hardware.h>

#endif



#include "ac97c.h"



enum {

sound/pci/azt3328.c

+16 −22
Original line number Diff line number Diff line
@@ -979,31 +979,25 @@ snd_azf3328_codec_setfmt(struct snd_azf3328_codec_data *codec, 


	snd_azf3328_dbgcallenter();

	switch (bitrate) {

#define AZF_FMT_XLATE(in_freq, out_bits) \

	do { \

		case AZF_FREQ_ ## in_freq: \

			freq = SOUNDFORMAT_FREQ_ ## out_bits; \

			break; \

	} while (0);

	AZF_FMT_XLATE(4000, SUSPECTED_4000)

	AZF_FMT_XLATE(4800, SUSPECTED_4800)

	/* the AZF3328 names it "5510" for some strange reason: */

	AZF_FMT_XLATE(5512, 5510)

	AZF_FMT_XLATE(6620, 6620)

	AZF_FMT_XLATE(8000, 8000)

	AZF_FMT_XLATE(9600, 9600)

	AZF_FMT_XLATE(11025, 11025)

	AZF_FMT_XLATE(13240, SUSPECTED_13240)

	AZF_FMT_XLATE(16000, 16000)

	AZF_FMT_XLATE(22050, 22050)

	AZF_FMT_XLATE(32000, 32000)

	case AZF_FREQ_4000:  freq = SOUNDFORMAT_FREQ_SUSPECTED_4000; break;

	case AZF_FREQ_4800:  freq = SOUNDFORMAT_FREQ_SUSPECTED_4800; break;

	case AZF_FREQ_5512:

		/* the AZF3328 names it "5510" for some strange reason */

			     freq = SOUNDFORMAT_FREQ_5510; break;

	case AZF_FREQ_6620:  freq = SOUNDFORMAT_FREQ_6620; break;

	case AZF_FREQ_8000:  freq = SOUNDFORMAT_FREQ_8000; break;

	case AZF_FREQ_9600:  freq = SOUNDFORMAT_FREQ_9600; break;

	case AZF_FREQ_11025: freq = SOUNDFORMAT_FREQ_11025; break;

	case AZF_FREQ_13240: freq = SOUNDFORMAT_FREQ_SUSPECTED_13240; break;

	case AZF_FREQ_16000: freq = SOUNDFORMAT_FREQ_16000; break;

	case AZF_FREQ_22050: freq = SOUNDFORMAT_FREQ_22050; break;

	case AZF_FREQ_32000: freq = SOUNDFORMAT_FREQ_32000; break;

	default:

		snd_printk(KERN_WARNING "unknown bitrate %d, assuming 44.1kHz!\n", bitrate);

		/* fall-through */

	AZF_FMT_XLATE(44100, 44100)

	AZF_FMT_XLATE(48000, 48000)

	AZF_FMT_XLATE(66200, SUSPECTED_66200)

#undef AZF_FMT_XLATE

	case AZF_FREQ_44100: freq = SOUNDFORMAT_FREQ_44100; break;

	case AZF_FREQ_48000: freq = SOUNDFORMAT_FREQ_48000; break;

	case AZF_FREQ_66200: freq = SOUNDFORMAT_FREQ_SUSPECTED_66200; break;

	}

	/* val = 0xff07; 3m27.993s (65301Hz; -> 64000Hz???) hmm, 66120, 65967, 66123 */

	/* val = 0xff09; 17m15.098s (13123,478Hz; -> 12000Hz???) hmm, 13237.2Hz? */

sound/pci/hda/hda_eld.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static void hdmi_show_short_audio_desc(struct cea_sad *a) 
	snd_print_pcm_rates(a->rates, buf, sizeof(buf));



	if (a->format == AUDIO_CODING_TYPE_LPCM)

		snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2 - 8));

		snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2) - 8);

	else if (a->max_bitrate)

		snprintf(buf2, sizeof(buf2),

				", max bitrate = %d", a->max_bitrate);

sound/pci/hda/patch_realtek.c

+4 −2
Original line number Diff line number Diff line
@@ -14954,9 +14954,11 @@ static struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),

	SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),

	SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),

	SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x21e9, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x21ca, "Thinkpad L412", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x21e9, "Thinkpad Edge 15", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),

	SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),

	{}

sound/pci/oxygen/xonar_cs43xx.c

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static void dump_d1_registers(struct oxygen *chip, 
	unsigned int i;



	snd_iprintf(buffer, "\nCS4398: 7?");

	for (i = 2; i <= 8; ++i)

	for (i = 2; i < 8; ++i)

		snd_iprintf(buffer, " %02x", data->cs4398_regs[i]);

	snd_iprintf(buffer, "\n");

	dump_cs4362a_registers(data, buffer);

CRA Git | Maintained and supported by SUSTech CRA and CCSE