Commit d3570a5a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.alsa-project.org/alsa-kernel 

* 'for-linus' of git://git.alsa-project.org/alsa-kernel: (258 commits)
  ALSA: hda: VREF powerdown for headphones
  ALSA: hda: STAC_HP_M4
  ALSA: ASoC: Check for machine type in GTA01 machine driver
  ALSA: mtpav - Fix race in probe
  ALSA: usb-audio: dynamic detection of MIDI interfaces in uaxx-quirk
  ALSA: Add a note on dependency of RTC stuff
  ALSA: ASoC: add new param mux to dapm_mux_update_power
  ALSA: Increase components array size
  ALSA: ASoC: Correct inverted Mic PGA Switch control in wm8510 driver
  ALSA: hda: comment typo fix
  ALSA: hda: comment typo fix
  ALSA: hda - Fix PCI SSID for ASROCK K18N78FullHD-hSLI
  ALSA: snd-usb-audio: support for Edirol UA-4FX device
  ALSA: usb - Fix possible Oops at USB-MIDI disconnection
  ALSA: hda - Fix another ALC889A (rev 0x100101)
  ALSA: hda: add more board-specific information for Realtek ALC662 rev1
  ALSA: Correct Vladimir Barinov's e-mail address
  ALSA: cs46xx: Add PCI IDs for TerraTec and Hercules cards
  ALSA: hda: SPDIF stream muting support
  ALSA: hda: appletv support
  ...
parents 37d9869e 72474be6

Documentation/sound/alsa/ALSA-Configuration.txt

+52 −10
Original line number Diff line number Diff line
@@ -746,8 +746,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
  Module snd-hda-intel

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



    Module for Intel HD Audio (ICH6, ICH6M, ESB2, ICH7, ICH8),

		ATI SB450, SB600, RS600,

    Module for Intel HD Audio (ICH6, ICH6M, ESB2, ICH7, ICH8, ICH9, ICH10,

			PCH, SCH),

		ATI SB450, SB600, R600, RS600, RS690, RS780, RV610, RV620,

			RV630, RV635, RV670, RV770,

		VIA VT8251/VT8237A,

		SIS966, ULI M5461
@@ -807,6 +809,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	ALC260

	  hp		HP machines

	  hp-3013	HP machines (3013-variant)

	  hp-dc7600	HP DC7600

	  fujitsu	Fujitsu S7020

	  acer		Acer TravelMate

	  will		Will laptops (PB V7900)
@@ -828,8 +831,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  hippo		Hippo (ATI) with jack detection, Sony UX-90s

	  hippo_1	Hippo (Benq) with jack detection

	  sony-assamd	Sony ASSAMD

	  toshiba-s06	Toshiba S06

	  toshiba-rx1	Toshiba RX1

	  ultra		Samsung Q1 Ultra Vista model

	  lenovo-3000	Lenovo 3000 y410

	  nec		NEC Versa S9100

	  basic		fixed pin assignment w/o SPDIF

	  auto		auto-config reading BIOS (default)
@@ -838,6 +844,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  3stack	3-stack model

	  toshiba	Toshiba A205

	  acer		Acer laptops

	  acer-aspire	Acer Aspire One

	  dell		Dell OEM laptops (Vostro 1200)

	  zepto		Zepto laptops

	  test		for testing/debugging purpose, almost all controls can
@@ -847,6 +854,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


	ALC269

	  basic		Basic preset

	  quanta	Quanta FL1

	  eeepc-p703	ASUS Eeepc P703 P900A

	  eeepc-p901	ASUS Eeepc P901 S101



	ALC662/663

	  3stack-dig	3-stack (2-channel) with SPDIF
@@ -856,10 +866,17 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  lenovo-101e	 Lenovo laptop

	  eeepc-p701	ASUS Eeepc P701

	  eeepc-ep20	ASUS Eeepc EP20

	  ecs		ECS/Foxconn mobo

	  m51va		ASUS M51VA

	  g71v		ASUS G71V

	  h13		ASUS H13

	  g50v		ASUS G50V

	  asus-mode1	ASUS

	  asus-mode2	ASUS

	  asus-mode3	ASUS

	  asus-mode4	ASUS

	  asus-mode5	ASUS

	  asus-mode6	ASUS

	  auto		auto-config reading BIOS (default)



	ALC882/885
@@ -891,12 +908,14 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  lenovo-101e	Lenovo 101E

	  lenovo-nb0763	Lenovo NB0763

	  lenovo-ms7195-dig Lenovo MS7195

	  lenovo-sky	Lenovo Sky

	  haier-w66	Haier W66

	  3stack-hp	HP machines with 3stack (Lucknow, Samba boards)

	  6stack-dell	Dell machines with 6stack (Inspiron 530)

	  mitac		Mitac 8252D

	  clevo-m720	Clevo M720 laptop series

	  fujitsu-pi2515 Fujitsu AMILO Pi2515

	  3stack-6ch-intel Intel DG33* boards

	  auto		auto-config reading BIOS (default)



	ALC861/660
@@ -929,7 +948,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  allout	5-jack in back, 2-jack in front, SPDIF out

	  auto		auto-config reading BIOS (default)



	AD1882

	AD1882 / AD1882A

	  3stack	3-stack mode (default)

	  6stack	6-stack mode
@@ -1079,7 +1098,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	    register value without FIFO size correction as the current

	    DMA pointer.  position_fix=2 will make the driver to use

	    the position buffer instead of reading SD_LPIB register.

	    (Usually SD_LPLIB register is more accurate than the

	    (Usually SD_LPIB register is more accurate than the

	    position buffer.)



    NB: If you get many "azx_get_response timeout" messages at
@@ -1166,6 +1185,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
			* Event Electronics, EZ8

                        * Digigram VX442

			* Lionstracs, Mediastaton

			* Terrasoniq TS 88



    model       - Use the given board model, one of the following:

		  delta1010, dio2496, delta66, delta44, audiophile, delta410,
@@ -1201,6 +1221,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
			* TerraTec Phase 28

			* AudioTrak Prodigy 7.1

			* AudioTrak Prodigy 7.1 LT

			* AudioTrak Prodigy 7.1 XT

			* AudioTrak Prodigy 7.1 HIFI

			* AudioTrak Prodigy 7.1 HD2

			* AudioTrak Prodigy 192

			* Pontis MS300

			* Albatron K8X800 Pro II
@@ -1211,12 +1234,16 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
			* Shuttle SN25P

			* Onkyo SE-90PCI

			* Onkyo SE-200PCI

			* ESI Juli@

			* Hercules Fortissimo IV

			* EGO-SYS WaveTerminal 192M



    model       - Use the given board model, one of the following:

		  revo51, revo71, amp2000, prodigy71, prodigy71lt,

		  prodigy192, aureon51, aureon71, universe, ap192,

		  k8x800, phase22, phase28, ms300, av710, se200pci,

		  se90pci

		  prodigy71xt, prodigy71hifi, prodigyhd2, prodigy192,

		  juli, aureon51, aureon71, universe, ap192, k8x800,

		  phase22, phase28, ms300, av710, se200pci, se90pci,

		  fortissimo4, sn25p, WT192M



    This module supports multiple cards and autoprobe.
@@ -1255,7 +1282,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    Module for AC'97 motherboards from Intel and compatibles.

			* Intel i810/810E, i815, i820, i830, i84x, MX440

				ICH5, ICH6, ICH7, ESB2

				ICH5, ICH6, ICH7, 6300ESB, ESB2

			* SiS 7012 (SiS 735)

			* NVidia NForce, NForce2, NForce3, MCP04, CK804

				 CK8, CK8S, MCP501
@@ -1951,6 +1978,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
			* CHIC  True Sound 4Dwave

			* Shark  Predator4D-PCI

			* Jaton  SonicWave 4D

			* SiS SI7018 PCI Audio

			* Hoontech SoundTrack Digital 4DWave NX



    pcm_channels   - max channels (voices) reserved for PCM

    wavetable_size - max wavetable size in kB (4-?kb)
@@ -1966,12 +1995,25 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    vid             - Vendor ID for the device (optional)

    pid             - Product ID for the device (optional)

    nrpacks	    - Max. number of packets per URB (default: 8)

    async_unlink    - Use async unlink mode (default: yes)

    device_setup    - Device specific magic number (optional)

                    - Influence depends on the device

                    - Default: 0x0000 

    ignore_ctl_error - Ignore any USB-controller regarding mixer

    		       interface (default: no)



    This module supports multiple devices, autoprobe and hotplugging.



    NB: nrpacks parameter can be modified dynamically via sysfs.

        Don't put the value over 20.  Changing via sysfs has no sanity

	check.

    NB: async_unlink=0 would cause Oops.  It remains just for

        debugging purpose (if any).

    NB: ignore_ctl_error=1 may help when you get an error at accessing

        the mixer element such as URB error -22.  This happens on some

        buggy USB device or the controller.



  Module snd-usb-caiaq

  --------------------
@@ -2078,7 +2120,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
  -------------------



    Module for sound cards based on the Asus AV100/AV200 chips,

    i.e., Xonar D1, DX, D2 and D2X.

    i.e., Xonar D1, DX, D2, D2X and HDAV1.3 (Deluxe).



    This module supports autoprobe and multiple cards.

Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl

+38 −24
Original line number Diff line number Diff line
@@ -6135,44 +6135,58 @@ struct _snd_pcm_runtime { 
      </para>

    </section>



    <section id="useful-functions-snd-assert">

      <title><function>snd_assert()</function></title>

    <section id="useful-functions-snd-bug">

      <title><function>snd_BUG()</function></title>

      <para>

        It shows the <computeroutput>BUG?</computeroutput> message and

      stack trace as well as <function>snd_BUG_ON</function> at the point.

      It's useful to show that a fatal error happens there. 

      </para>

      <para>

	 When no debug flag is set, this macro is ignored. 

      </para>

    </section>



    <section id="useful-functions-snd-bug-on">

      <title><function>snd_BUG_ON()</function></title>

      <para>

        <function>snd_assert()</function> macro is similar with the

      normal <function>assert()</function> macro. For example,  

        <function>snd_BUG_ON()</function> macro is similar with

	<function>WARN_ON()</function> macro. For example,  



        <informalexample>

          <programlisting>

<![CDATA[

  snd_assert(pointer != NULL, return -EINVAL);

  snd_BUG_ON(!pointer);

]]>

          </programlisting>

        </informalexample>

      </para>



      <para>

        The first argument is the expression to evaluate, and the

      second argument is the action if it fails. When

      <constant>CONFIG_SND_DEBUG</constant>, is set, it will show an

      error message such as <computeroutput>BUG? (xxx)</computeroutput>

      together with stack trace.

      </para>

      <para>

	 When no debug flag is set, this macro is ignored. 

      </para>

    </section>

	or it can be used as the condition,

        <informalexample>

          <programlisting>

<![CDATA[

  if (snd_BUG_ON(non_zero_is_bug))

          return -EINVAL;

]]>

          </programlisting>

        </informalexample>



    <section id="useful-functions-snd-bug">

      <title><function>snd_BUG()</function></title>

      <para>

        It shows the <computeroutput>BUG?</computeroutput> message and

      stack trace as well as <function>snd_assert</function> at the point.

      It's useful to show that a fatal error happens there. 

      </para>



      <para>

	 When no debug flag is set, this macro is ignored. 

        The macro takes an conditional expression to evaluate.

	When <constant>CONFIG_SND_DEBUG</constant>, is set, the

	expression is actually evaluated. If it's non-zero, it shows

	the warning message such as

	<computeroutput>BUG? (xxx)</computeroutput>

	normally followed by stack trace.  It returns the evaluated

	value.

	When no <constant>CONFIG_SND_DEBUG</constant> is set, this

	macro always returns zero.

      </para>



    </section>



  </chapter>

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -3828,6 +3828,8 @@ S: Maintained 
SOUND

P:	Jaroslav Kysela

M:	perex@perex.cz

P:	Takashi Iwai

M:	tiwai@suse.de

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

S:	Maintained

arch/arm/plat-omap/include/mach/mtd-xip.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Do not include this file directly. It's included from linux/mtd/xip.h

 *

 * Author: Vladimir Barinov <vbarinov@ru.mvista.com>

 * Author: Vladimir Barinov <vbarinov@embeddedalley.com>

 *

 * (c) 2005 MontaVista Software, Inc.  This file is licensed under the

 * terms of the GNU General Public License version 2.  This program is

arch/um/Kconfig.char

+4 −0
Original line number Diff line number Diff line
@@ -203,6 +203,10 @@ config SOUND 
	tristate

	default UML_SOUND



config SOUND_OSS_CORE

	bool

	default UML_SOUND



config HOSTAUDIO

	tristate

	default UML_SOUND

CRA Git | Maintained and supported by SUSTech CRA and CCSE