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

Commit a421018e 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: (294 commits)
  S3C64XX: Staticise platform data for PCM devices
  ASoC: Rename controls with a / in wm_hubs
  snd-fm801: autodetect SF64-PCR (tuner-only) card
  ALSA: tea575x-tuner: fix mute
  ASoC: au1x: dbdma2: plug memleak in pcm device creation error path
  ASoC: au1x: dbdma2: fix oops on soc device removal.
  ALSA: hda - Fix memory leaks in the previous patch
  ALSA: hda - Add ALC661/259, ALC892/888VD support
  ALSA: opti9xx: remove snd_opti9xx fields
  ALSA: aaci - Clean up duplicate code
  ALSA: usb - Fix mixer map for Hercules Gamesurround Muse Pocket LT
  ALSA: hda - Add position_fix quirk for HP dv3
  ALSA: hda - Add a pin-fix for FSC Amilo Pi1505
  ALSA: hda - Fix Cxt5047 test mode
  ASoC: pxa/raumfeld: adopt new snd_soc_dai_set_pll() API
  ASoC: sh: fsi: Add runtime PM support
  sh: ms7724se: Add runtime PM support for FSI
  ALSA: hda - Add a position_fix quirk for MSI Wind U115
  ALSA: opti-miro: add PnP detection
  ALSA: opti-miro: separate comon probing code
  ...
parents 3ad1f3b3 86e1d57e

Documentation/sound/alsa/ALSA-Configuration.txt

+9 −4
Original line number Diff line number Diff line
@@ -798,6 +798,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    		setup before initializing the codecs.  This option is

		available only when CONFIG_SND_HDA_PATCH_LOADER=y is set.

		See HD-Audio.txt for details.

    beep_mode	- Selects the beep registration mode (0=off, 1=on, 2=

		dynamic registration via mute switch on/off); the default

		value is set via CONFIG_SND_HDA_INPUT_BEEP_MODE kconfig.

    

    [Single (global) options]

    single_cmd  - Use single immediate commands to communicate with
@@ -1454,6 +1457,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    Module for internal PC-Speaker.



    nopcm	- Disable PC-Speaker PCM sound. Only beeps remain.

    nforce_wa	- enable NForce chipset workaround. Expect bad sound.



    This module supports system beeps, some kind of PCM playback and
@@ -1631,7 +1635,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
  Module snd-sscape

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



    Module for ENSONIQ SoundScape PnP cards.

    Module for ENSONIQ SoundScape cards.



    port	- Port # (PnP setup)

    wss_port	- WSS Port # (PnP setup)
@@ -1639,10 +1643,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    mpu_irq	- MPU-401 IRQ # (PnP setup)

    dma		- DMA # (PnP setup)

    dma2	- 2nd DMA # (PnP setup, -1 to disable)

    joystick	- Enable gameport - 0 = disable (default), 1 = enable



    This module supports multiple cards.



    This module supports multiple cards.  ISA PnP must be enabled.

    You need sscape_ctl tool in alsa-tools package for loading

    the microcode.

    The driver requires the firmware loader support on kernel.



  Module snd-sun-amd7930 (on sparc only)

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

Documentation/sound/alsa/ControlNames.txt

+2 −1
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ SOURCE: 
  Master

  Master Mono

  Hardware Master

  Speaker	(internal speaker)

  Headphone

  PC Speaker

  Beep		(beep generator)

  Phone

  Phone Input

  Phone Output

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

+1 −0
Original line number Diff line number Diff line
@@ -391,6 +391,7 @@ STAC92HD83* 
  ref		Reference board

  mic-ref	Reference board with power management for ports

  dell-s14	Dell laptop

  hp		HP laptops with (inverted) mute-LED

  auto		BIOS setup (default)



STAC9872

arch/arm/mach-davinci/include/mach/asp.h

+8 −0
Original line number Diff line number Diff line
@@ -51,6 +51,14 @@ struct snd_platform_data { 
	u32 rx_dma_offset;

	enum dma_event_q eventq_no;	/* event queue number */

	unsigned int codec_fmt;

	/*

	 * Allowing this is more efficient and eliminates left and right swaps

	 * caused by underruns, but will swap the left and right channels

	 * when compared to previous behavior.

	 */

	unsigned enable_channel_combine:1;

	unsigned sram_size_playback;

	unsigned sram_size_capture;



	/* McASP specific fields */

	int tdm_slots;

arch/arm/mach-omap2/board-3430sdp.c

+10 −0
Original line number Diff line number Diff line
@@ -410,6 +410,15 @@ static struct regulator_init_data sdp3430_vpll2 = { 
	.consumer_supplies	= &sdp3430_vdvi_supply,

};



static struct twl4030_codec_audio_data sdp3430_audio = {

	.audio_mclk = 26000000,

};



static struct twl4030_codec_data sdp3430_codec = {

	.audio_mclk = 26000000,

	.audio = &sdp3430_audio,

};



static struct twl4030_platform_data sdp3430_twldata = {

	.irq_base	= TWL4030_IRQ_BASE,

	.irq_end	= TWL4030_IRQ_END,
@@ -420,6 +429,7 @@ static struct twl4030_platform_data sdp3430_twldata = { 
	.madc		= &sdp3430_madc_data,

	.keypad		= &sdp3430_kp_data,

	.usb		= &sdp3430_usb_data,

	.codec		= &sdp3430_codec,



	.vaux1		= &sdp3430_vaux1,

	.vaux2		= &sdp3430_vaux2,