Commit 524df557 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: (252 commits)
  ASoC: Check progress when reporting periods from i.MX FIQ handler
  ASoC: Remove a unused variables from i.MX FIQ runtime data
  ALSA: hda - Add/fix ALC269 FSC and Quanta models
  ALSA: hda - Add ALC670 codec support
  OMAP4: PMIC: Add support for twl6030 codec
  ALSA: hda - remove unnecessary msleep on power state transitions
  usb/gadget/{f_audio,gmidi}.c: follow recent changes in audio.h
  ASoC: fsi: Modify over/under run error settlement
  ASoC: OMAP4: Add McPDM platform driver
  ASoC: OMAP4: Add support for McPDM
  ASoC: OMAP: data_type and sync_mode configurable in audio dma
  ALSA: hda - Add missing description in HD-Audio-Models.txt
  ALSA: add support for Macbook Air 2,1 internal speaker
  ALSA: usbaudio: consolidate header files
  ALSA: usbmixer: bail out early when parsing audio class v2 descriptors
  ALSA: usbaudio: implement basic set of class v2.0 parser
  ALSA: usbaudio: introduce new types for audio class v2
  ALSA: usbaudio: parse USB descriptors with structs
  ALSA: hda - enable snoop for Intel Cougar Point
  ALSA: hda - Remove identical definitions for macmini3 model
  ...
parents 0f453397 6679ee18

Documentation/sound/alsa/ALSA-Configuration.txt

+26 −1
Original line number Diff line number Diff line
@@ -482,6 +482,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    reference_rate	- reference sample rate, 44100 or 48000 (default)

    multiple		- multiple to ref. sample rate, 1 or 2 (default)

    subsystem		- override the PCI SSID for probing; the value

			  consists of SSVID << 16 | SSDID.  The default is

			  zero, which means no override.



    This module supports multiple cards.
@@ -1123,6 +1126,21 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    This module supports multiple cards, autoprobe and ISA PnP.



  Module snd-jazz16

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



    Module for Media Vision Jazz16 chipset. The chipset consists of 3 chips:

    MVD1216 + MVA416 + MVA514.



    port	- port # for SB DSP chip (0x210,0x220,0x230,0x240,0x250,0x260)

    irq		- IRQ # for SB DSP chip (3,5,7,9,10,15)

    dma8	- DMA # for SB DSP chip (1,3)

    dma16	- DMA # for SB DSP chip (5,7)

    mpu_port	- MPU-401 port # (0x300,0x310,0x320,0x330)

    mpu_irq	- MPU-401 irq # (2,3,5,7)



    This module supports multiple cards.



  Module snd-korg1212

  -------------------
@@ -1791,6 +1809,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    The power-management is supported.



  Module snd-ua101

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



    Module for the Edirol UA-101 audio/MIDI interface.



    This module supports multiple devices, autoprobe and hotplugging.



  Module snd-usb-audio

  --------------------
@@ -1923,7 +1948,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, D2X, HDAV1.3 (Deluxe), Essence ST

    i.e., Xonar D1, DX, D2, D2X, DS, HDAV1.3 (Deluxe), Essence ST

    (Deluxe) and Essence STX.



    This module supports autoprobe and multiple cards.

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

+5 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ ALC882/883/885/888/889 
  asus-a7m	ASUS A7M

  macpro	MacPro support

  mb5		Macbook 5,1

  macmini3	Macmini 3,1

  mba21		Macbook Air 2,1

  mbp3		Macbook Pro rev3

  imac24	iMac 24'' with jack detection

  imac91	iMac 9,1
@@ -279,13 +281,16 @@ Conexant 5051 
  laptop	Basic Laptop config (default)

  hp		HP Spartan laptop

  hp-dv6736	HP dv6736

  hp-f700	HP Compaq Presario F700

  lenovo-x200	Lenovo X200 laptop

  toshiba	Toshiba Satellite M300



Conexant 5066

=============

  laptop	Basic Laptop config (default)

  dell-laptop	Dell laptops

  olpc-xo-1_5	OLPC XO 1.5

  ideapad       Lenovo IdeaPad U150



STAC9200

========

Documentation/sound/alsa/HD-Audio.txt

+27 −0
Original line number Diff line number Diff line
@@ -452,6 +452,33 @@ Similarly, the lines after `[verb]` are parsed as `init_verbs` 
sysfs entries, and the lines after `[hint]` are parsed as `hints`

sysfs entries, respectively.



Another example to override the codec vendor id from 0x12345678 to

0xdeadbeef is like below:

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

  [codec]

  0x12345678 0xabcd1234 2



  [vendor_id]

  0xdeadbeef

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



In the similar way, you can override the codec subsystem_id via

`[subsystem_id]`, the revision id via `[revision_id]` line.

Also, the codec chip name can be rewritten via `[chip_name]` line.

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

  [codec]

  0x12345678 0xabcd1234 2



  [subsystem_id]

  0xffff1111



  [revision_id]

  0x10



  [chip_name]

  My-own NEWS-0002

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



The hd-audio driver reads the file via request_firmware().  Thus,

a patch file has to be located on the appropriate firmware path,

typically, /lib/firmware.  For example, when you pass the option

arch/arm/plat-mxc/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -13,3 +13,7 @@ obj-$(CONFIG_USB_EHCI_MXC) += ehci.o 
obj-$(CONFIG_MXC_ULPI) += ulpi.o

obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o

obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o

ifdef CONFIG_SND_IMX_SOC

obj-y += ssi-fiq.o

obj-y += ssi-fiq-ksym.o

endif

arch/arm/plat-mxc/ssi-fiq-ksym.c

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/*

 * Exported ksyms for the SSI FIQ handler

 *

 * Copyright (C) 2009, Sascha Hauer <s.hauer@pengutronix.de>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/module.h>



#include <mach/ssi.h>



EXPORT_SYMBOL(imx_ssi_fiq_tx_buffer);

EXPORT_SYMBOL(imx_ssi_fiq_rx_buffer);

EXPORT_SYMBOL(imx_ssi_fiq_start);

EXPORT_SYMBOL(imx_ssi_fiq_end);

EXPORT_SYMBOL(imx_ssi_fiq_base);

CRA Git | Maintained and supported by SUSTech CRA and CCSE