Commit 710421cc 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: (346 commits)
  ASoC: core: Don't set "(null)" as a driver name
  ALSA: hda - Use LPIB for ATI/AMD chipsets as default
  Revert "ALSA: hda - Use position_fix=3 as default for AMD chipsets"
  ASoC: Tegra: Fix compile when debugfs not enabled
  ASoC: spdif-dit: Add missing MODULE_*
  SOUND: OSS: Remove Au1550 driver.
  ALSA: hda - add Intel Panther Point HDMI codec id
  ALSA: emu10k1 - Add dB range to Bass and Treble for SB Live!
  ALSA: hda - Remove PCM mixer elements from Virtual Master of realtek
  ALSA: hda - Fix input-src parse in patch_analog.c
  ASoC: davinci-mcasp: enable ping-pong SRAM buffers
  ASoC: add iPAQ hx4700 machine driver
  ASoC: Asahi Kasei AK4641 codec driver
  ALSA: hda - Enable Realtek ALC269 codec input layer beep
  ALSA: intel8x0m: enable AMD8111 modem
  ALSA: HDA: Add jack detection for HDMI
  ALSA: sound, core, pcm_lib: fix xrun_log
  ASoC: Max98095: Move existing NULL check before pointer dereference.
  ALSA: sound, core, pcm_lib: xrun_log: log also in_interrupt
  ALSA: usb-audio - Add support for USB X-Fi S51 Pro
  ...
parents d7ef64a9 f686c74c

Documentation/sound/alsa/ALSA-Configuration.txt

+7 −0
Original line number Diff line number Diff line
@@ -1230,6 +1230,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    This module supports multiple cards.

    The driver requires the firmware loader support on kernel.



  Module snd-lola

  ---------------



    Module for Digigram Lola PCI-e boards



    This module supports multiple cards.



  Module snd-lx6464es

  -------------------

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

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ ALC662/663/272 
  3stack-dig	3-stack (2-channel) with SPDIF

  3stack-6ch	 3-stack (6-channel)

  3stack-6ch-dig 3-stack (6-channel) with SPDIF

  6stack-dig	 6-stack with SPDIF

  5stack-dig	 5-stack with SPDIF

  lenovo-101e	 Lenovo laptop

  eeepc-p701	ASUS Eeepc P701

  eeepc-ep20	ASUS Eeepc EP20

MAINTAINERS

+10 −3
Original line number Diff line number Diff line
@@ -4269,6 +4269,13 @@ M: Tim Hockin <thockin@hockin.org> 
S:	Maintained

F:	drivers/net/natsemi.c



NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER

M:	Daniel Mack <zonque@gmail.com>

S:	Maintained

L:	alsa-devel@alsa-project.org

W:	http://www.native-instruments.com

F:	sound/usb/caiaq/



NCP FILESYSTEM

M:	Petr Vandrovec <petr@vandrovec.name>

S:	Odd Fixes
@@ -5868,7 +5875,7 @@ F: include/sound/ 
F:	sound/



SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)

M:	Liam Girdwood <lrg@slimlogic.co.uk>

M:	Liam Girdwood <lrg@ti.com>

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -6119,7 +6126,7 @@ F: drivers/mmc/host/tifm_sd.c 
F:	include/linux/tifm.h



TI TWL4030 SERIES SOC CODEC DRIVER

M:	Peter Ujfalusi <peter.ujfalusi@nokia.com>

M:	Peter Ujfalusi <peter.ujfalusi@ti.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Maintained

F:	sound/soc/codecs/twl4030*
@@ -6763,7 +6770,7 @@ F: drivers/scsi/vmw_pvscsi.c 
F:	drivers/scsi/vmw_pvscsi.h



VOLTAGE AND CURRENT REGULATOR FRAMEWORK

M:	Liam Girdwood <lrg@slimlogic.co.uk>

M:	Liam Girdwood <lrg@ti.com>

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

W:	http://opensource.wolfsonmicro.com/node/15

W:	http://www.slimlogic.co.uk/?p=48

arch/arm/mach-tegra/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -27,12 +27,14 @@ comment "Tegra board type" 


config MACH_HARMONY

       bool "Harmony board"

       select MACH_HAS_SND_SOC_TEGRA_WM8903

       help

         Support for nVidia Harmony development platform



config MACH_KAEN

       bool "Kaen board"

       select MACH_SEABOARD

       select MACH_HAS_SND_SOC_TEGRA_WM8903

       help

         Support for the Kaen version of Seaboard
@@ -43,6 +45,7 @@ config MACH_PAZ00 


config MACH_SEABOARD

       bool "Seaboard board"

       select MACH_HAS_SND_SOC_TEGRA_WM8903

       help

         Support for nVidia Seaboard development platform. It will

	 also be included for some of the derivative boards that

arch/arm/mach-tegra/board-harmony.c

+4 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include <asm/mach/time.h>

#include <asm/setup.h>



#include <mach/harmony_audio.h>

#include <mach/tegra_wm8903_pdata.h>

#include <mach/iomap.h>

#include <mach/irqs.h>

#include <mach/sdhci.h>
@@ -67,15 +67,16 @@ static struct platform_device debug_uart = { 
	},

};



static struct harmony_audio_platform_data harmony_audio_pdata = {

static struct tegra_wm8903_platform_data harmony_audio_pdata = {

	.gpio_spkr_en		= TEGRA_GPIO_SPKR_EN,

	.gpio_hp_det		= TEGRA_GPIO_HP_DET,

	.gpio_hp_mute		= -1,

	.gpio_int_mic_en	= TEGRA_GPIO_INT_MIC_EN,

	.gpio_ext_mic_en	= TEGRA_GPIO_EXT_MIC_EN,

};



static struct platform_device harmony_audio_device = {

	.name	= "tegra-snd-harmony",

	.name	= "tegra-snd-wm8903",

	.id	= 0,

	.dev	= {

		.platform_data  = &harmony_audio_pdata,

CRA Git | Maintained and supported by SUSTech CRA and CCSE