Commit 0a3fd051 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa 

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (122 commits)
  [ALSA] version 1.0.14rc4
  [ALSA] Add speaker pin sequencing to hda_codec.c:snd_hda_parse_pin_def_config()
  [ALSA] hda-codec - Add ALC861VD Lenovo support
  [ALSA] hda-codec - Fix connection list in generic parser
  [ALSA] usb-audio: work around wrong wMaxPacketSize on ESI M4U
  [ALSA] usb-audio: work around broken M-Audio MidiSport Uno firmware
  [ALSA] usb-audio: explicitly match Logitech QuickCam
  [ALSA] hda-codec - Fix a typo
  [ALSA] hda-codec - Fix ALC880 uniwill auto-mutes
  [ALSA] hda-codec - Fix AD1988 SPDIF playback route control
  [ALSA] wm8750 typo fix
  [ALSA] wavefront: only declare isapnp on CONFIG_PNP
  [ALSA] hda-codec - bug fixes for stac92xx HDA codecs.
  [ALSA] add MODULE_FIRMWARE entries
  [ALSA] do not depend on FW_LOADER when internal firmware images are used
  [ALSA] hda-codec - Fix resume of STAC92xx codecs
  [ALSA] usbaudio - Revert the minimal period size fix patch
  [ALSA] hda-codec - Add support for new HP DV series laptops
  [ALSA] usb-audio - Fix the minimum period size per transfer mode
  [ALSA] sound/pcmcia/vx/vxpocket.c: fix an if() condition
  ...
parents 57a44415 c911d1e1

Documentation/sound/alsa/ALSA-Configuration.txt

+20 −1
Original line number Diff line number Diff line
@@ -821,6 +821,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  6stack-dig	6-jack digital with SPDIF I/O

	  arima		Arima W820Di1

	  macpro	MacPro support

	  w2jc		ASUS W2JC

	  auto		auto-config reading BIOS (default)



	ALC883/888
@@ -852,6 +853,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  3stack-dig	3-jack with SPDIF OUT

	  6stack-dig	6-jack with SPDIF OUT

	  3stack-660	3-jack (for ALC660VD)

	  lenovo	Lenovo 3000 C200

	  auto		auto-config reading BIOS (default)



	CMI9880
@@ -909,6 +911,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  macbook	Intel Mac Book

	  macbook-pro-v1 Intel Mac Book Pro 1st generation

	  macbook-pro	Intel Mac Book Pro 2nd generation

	  imac-intel	Intel iMac



	STAC9202/9250/9251

	  ref		Reference board, base config
@@ -924,6 +927,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  vaio		Setup for VAIO FE550G/SZ110

	  vaio-ar Setup for VAIO AR



    The model name "genric" is treated as a special case.  When this

    model is given, the driver uses the generic codec parser without

    "codec-patch".  It's sometimes good for testing and debugging.



    If the default configuration doesn't work and one of the above

    matches with your device, report it together with the PCI

    subsystem ID (output of "lspci -nv") to ALSA BTS or alsa-devel
@@ -1278,6 +1285,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    port	- port number or -1 (disable)

    irq		- IRQ number or -1 (disable)

    pnp		- PnP detection - 0 = disable, 1 = enable (default)

    uart_enter	- Issue UART_ENTER command at open - bool, default = on



    This module supports multiple devices and PnP.
@@ -1692,6 +1700,17 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    This module supports multiple devices, autoprobe and hotplugging.



  Module snd-usb-caiaq

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



    Module for caiaq UB audio interfaces,

	    * Native Instruments RigKontrol2

	    * Native Instruments Kore Controller

	    * Native Instruments Audio Kontrol 1

	    * Native Instruments Audio 8 DJ



    This module supports multiple devices, autoprobe and hotplugging.



  Module snd-usb-usx2y

  --------------------
@@ -2046,4 +2065,4 @@ Links and Addresses 
       https://bugtrack.alsa-project.org/bugs/



  ALSA Developers ML

       mailto:alsa-devel@lists.sourceforge.net
 
       mailto:alsa-devel@alsa-project.org

Documentation/sound/alsa/Bt87x.txt

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ recorded data is not right, try to specify the digital_rate option with 
other values than the default 32000 (often it's 44100 or 64000).



If you have an unknown card, please mail the ID and board name to

<alsa-devel@lists.sf.net>, regardless of whether audio capture works or

not, so that future versions of this driver know about your card.

<alsa-devel@alsa-project.org>, regardless of whether audio capture works

or not, so that future versions of this driver know about your card.





Audio modes

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ AOA (Apple Onboard Audio) ALSA DRIVER 
P:	Johannes Berg

M:	johannes@sipsolutions.net

L:	linuxppc-dev@ozlabs.org

L:	alsa-devel@alsa-project.org

L:	alsa-devel@alsa-project.org (subscribers-only)

S:	Maintained



APM DRIVER
@@ -3239,13 +3239,13 @@ S: Maintained 
SOUND

P:	Jaroslav Kysela

M:	perex@suse.cz

L:	alsa-devel@alsa-project.org

L:	alsa-devel@alsa-project.org (subscribers-only)

S:	Maintained



SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT

P:	Liam Girdwood

M:	liam.girdwood@wolfsonmicro.com

L:	alsa-devel@alsa-project.org

L:	alsa-devel@alsa-project.org (subscribers-only)

S:	Supported



SPI SUBSYSTEM

include/linux/i2c-id.h

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ 
#define I2C_DRIVERID_ISL1208	88	/* Intersil ISL1208 RTC		*/

#define I2C_DRIVERID_WM8731		89	/* Wolfson WM8731 audio codec */

#define I2C_DRIVERID_WM8750		90	/* Wolfson WM8750 audio codec */

#define I2C_DRIVERID_WM8753		91	/* Wolfson WM8753 audio codec */



#define I2C_DRIVERID_I2CDEV	900

#define I2C_DRIVERID_ARP        902    /* SMBus ARP Client              */

include/sound/ak4114.h

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 


/* AK4114_REQ_FORMAT bits */

#define AK4114_MONO		(1<<7)	/* Double Sampling Frequency Mode: 0 = stereo, 1 = mono */

#define AK4114_DIF2		(1<<5)	/* Audio Data Control */

#define AK4114_DIF2		(1<<6)	/* Audio Data Control */

#define AK4114_DIF1		(1<<5)	/* Audio Data Control */

#define AK4114_DIF0		(1<<4)	/* Audio Data Control */

#define AK4114_DIF_16R		(0)				/* STDO: 16-bit, right justified */
@@ -158,7 +158,7 @@ 
#define AK4114_CHECK_NO_STAT	(1<<0)	/* no statistics */

#define AK4114_CHECK_NO_RATE	(1<<1)	/* no rate check */



#define AK4114_CONTROLS		14

#define AK4114_CONTROLS		15



typedef void (ak4114_write_t)(void *private_data, unsigned char addr, unsigned char data);

typedef unsigned char (ak4114_read_t)(void *private_data, unsigned char addr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE