Skip to contentSkip to conversation

sound updates for 2.6.40

GIT PULL Takashi Iwai 1 participant 1 message May 23, 2011

lore
Share & tools
lore
#0 lore raw

Linus,

please pull sound updates for v2.6.40-rc1 from:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus

No big changes in the sound core side since 2.6.39, but lots of changes in the drivers.

Some highlights:
* Addition of Digigram Lola driver
* Addition of Apple isight FireWire driver
* Clean-ups of TEA575x radio support on multiple boards
* Supports of new VIA VT1705/1802 codecs, lots of VIA-codec fixes
* Improvements on Realtek HD-audio auto-parsers, support of new codecs
* Support of auto-parser for Conexant HD-audio codecs
* Refactoring in HD-audio codes
* AMD HD-audio controller bug fixes
* ASIHPI driver updates
* New quirks and slight code-refctoring of USB-audio

For ASoC:
* New machine drivers for iPAQ hx4700, PCM hookup for WM8580 on Samsung reference platforms and Wolfson Speyside
* New CODEC drivers for AK4641, MAX98095 and WM8915
* Add support for period wakeup disablement on OMAP2 +
* Add support for more flexible machine driver names.
* WM8958 DSP2 support for VSS and enhanced EQ
* Overhaul of the SSM2602 driver
* Overhaul of the Tegra Harmony driver, generalising it to other designs based off the same reference.

Thanks!

Takashi

===

Adrian Wilkins (1):
ALSA: hda - Fix input-src parse in patch_analog.c

Andrew Morton (1):
ALSA: hda - sound/pci/hda/hda_codec.c: fix warning

Barry Song (1):
ASoC: Blackfin: push down SPORT settings from global variables

Ben Gardiner (3):
ALSA: sound, core, pcm_lib: xrun_log: log also in_interrupt
ALSA: sound, core, pcm_lib: fix xrun_log
ASoC: davinci-mcasp: enable ping-pong SRAM buffers

Clemens Ladisch (7):
ALSA: add Apple iSight microphone driver
ALSA: isight: fix isight_pcm_abort() crashes
ALSA: isight: fix packet requeueing
ALSA: isight: fix divide error when queueing packets
ALSA: isight: fix hang when unplugging a running device
ALSA: isight: remove experimental status
ALSA: isight: fix locking

Cliff Cai (2):
ASoC: Blackfin I2S: add 8-bit sample support
ASoC: SSM2602: convert to soc-cache

Daniel Mack (10):
ALSA: usb-audio: Add quirks for Audio Kontrol 6
ALSA: 6fire: use the kernel's built-in bit reverse table
MAINTAINERS: Add entry for Native Instruments sound driver
ALSA: usb-audio: make hwc_debug a noop in case HW_CONST_DEBUG is not set
ALSA: usb-audio: include format.h in format.c
ALSA: usb-audio: remove invalid extra mixers for Komplete Audio 6
ALSA: usb-audio: Add quirk for KORG PANDORA PX5D MIDI interface
ALSA: usb-audio: add quirks for Roland GR-55
ALSA: usb-audio: assume valid clock
ALSA: usb-audio: handle "Fast Track Ultra" with USB_DEVICE_VENDOR_SPEC()

David Henningsson (2):
ALSA: HDA: Use one dmic only for Dell Studio 1558
ALSA: HDA: Add jack detection for HDMI

Dimitris Papastamos (13):
ALSA: Add snd_ctl_replace() to dynamically replace a control
ASoC: soc-cache: Factor-out the I2C read code
ASoC: soc-cache: Introduce raw bulk write support
ASoC: Add control_type in snd_soc_codec
ASoC: soc-cache: Factor-out the hw_write() specific code
ASoC: soc-cache: Factor-out the hw_read() specific code
ASoC: soc-cache: Factor-out the SPI write code
ASoC: soc-cache: Return -ENOSYS instead of -EINVAL
ASoC: Add default snd_soc_default_writable_register() callback
ASoC: Add snd_soc_codec_{readable,writable}_register()
ASoC: soc-cache: Fix indentation issues
ASoC: soc-cache: Warn on syncing any non-writable registers
ASoC: soc-cache: Allow codec->cache_bypass to be used with snd_soc_hw_bulk_write_raw()

Dmitry Artamonow (2):
ASoC: Asahi Kasei AK4641 codec driver
ASoC: add iPAQ hx4700 machine driver

Dmitry Eremin-Solenikov (1):
ALSA: intel8x0m: enable AMD8111 modem

Eliot Blennerhassett (8):
ALSA: snd-asihpi: Control naming
ALSA: asihpi: Update debug printing
ALSA: asihpi: Handle playback drained status better
ALSA: asihpi: MMAP for non-busmaster cards
ALSA: asihpi: Remove 2 unused functions
ALSA: asihpi: Standardise substream name generation
ALSA: asihpi: Simplify driver unload cleanup
ALSA: asihpi: Minor cleanups

Jarkko Nikula (2):
ASoC: Fix wrong data type access in a few codec drivers
ASoC: core: Don't set "(null)" as a driver name

Jin Park (3):
ASoC: codecs: max98088: Fixed invalid register definitions in mixer controls
ASoC: codecs: max98088: Moved the EX Limiter Mode from dapm widget to control
ASoC: codecs: max98088: Added digital mute function in DAI1 and DAI2

Kailang Yang (3):
ALSA: hda - Add support of ALC898/899 codec
ALSA: hda - Add support of ALC221 / ALC276 codecs
ALSA: hda - Fix no sound after Windows boot with ALC269

Kuninori Morimoto (4):
ASoC: Add soc_remove_dai_links
ASoC: sh: fsi: add fsi_is_clk_master function
ASoC: sh: fsi: add dev_pm_ops :: suspend/resume
ASoC: sh: fsi: Add module/port clock control function

Lars-Peter Clausen (20):
ASoC: Make struct snd_soc_card's dapm_widgets and dapm_routes const
ASoC: JZ4740: Convert qi_lb60 codec to table based DAPM setup
ASoC: JZ4740: qi_lb60: Use gpio_request_array to request and setup gpios
ASoC: JZ4740: qi_lb60: Use the SND_SOC_DAPM_EVENT_OFF for the speakers status
ASoC: codecs: JZ4740: Convert to table based controls and DAPM setup
ASoC: Add dapm_find_widget helper
ASoC: Free the card's DAPM context
ASoC: Move DAPM debugfs directory creation to snd_soc_dapm_debugfs_init
ASoC: Move DAPM widget debugfs entry creation to snd_soc_dapm_new_widgets
ASoC: Remove DAPM debugfs entries before freeing widgets
ASoC: Create codec DAPM widgets before calling the codecs probe function
ASoC: SSM2602: Cleanup coeff handling
ASoC: SSM2602: Remove duplicate control
ASoC: SSM2602: Remove unused struct and define
ASoC: SSM2602: Fix default register cache
ASoC: SSM2602: Do not power the codec up in probe
ASoC: SSM2602: Add SSM2604 support
ASoC: SSM2602: Add entry for the ssm2603 to the device id table
ASoC: SSM2602: Model power supply for the digital core as a DAPM widget
ASoC: SSM2602: Provide dB ranges for the volume controls

Liam Girdwood (3):
ASoC: core - allow ASoC more flexible machine name
ASoC: twl6040 - fix LINEGAIN volume control
MAINTAINERS: ASoC and Regulator email address change.

Lu Guanqun (20):
ASoC: Use data based init for ak4671 DAPM
ASoC: Use data based init for cx20442 DAPM
ASoC: Use data based init for max98088 DAPM
ASoC: Use data based init for wm9713 DAPM
ASoC: Use data based init for wm9712 DAPM
ASoC: Use data based init for wm9705 DAPM
ASoC: Use data based init for wm8728 DAPM
ASoC: Use data based init for wm8711 DAPM
ASoC: Use data based init for tlv320aic23 DAPM
ASoC: Use data based init for ak4535 DAPM
ASoC: Use data based init for sn95031 DAPM
ASoC: sst_platform: initialize module_name properly
ASoC: sst_platform: free the resources on fail path
sst: make register_sst_card more self-contained
ASoC: sst_platform: unregister sst card when being closed
sst: fix compile error
ASoC: fix a simple coding style issue
ASoC: remove unused comment
ASoC: simple style fix
ASoC: fix two ident style problems

Lydia Wang (10):
ALSA: hda - VIA: Add new power management function.
ALSA: hda - VIA: Add support for VT1705
ALSA: hda - VIA: Add support for VT1802
ALSA: hda - VIA: Fix side channel mute invalid issue
ALSA: hda - VIA: Add VT1802 check in via_speaker_automute function
ALSA: hda - VIA: Update VT1708 initial verbs
ALSA: hda - VIA: Update VT1718S initial verbs
ALSA: hda - VIA: Update VT2002P initial verbs
ALSA: hda - VIA: Update unsolicited event function
ALSA: hda - VIA: Fix Smart5.1 isn't useful for 6 audio jacks motherboard.

Madis Janson (1):
ALSA: hda - Enable Realtek ALC269 codec input layer beep

Marek Vasut (1):
ASoC: Properly handle spitz MIC GPIO

Mark Brown (57):
ASoC: Treat WM8958 revision A as WM8994 revision D
ASoC: Factor WM8958 DSP2 handling into separate file
ASoC: Handle startup sequencing of WM8958 DSP2 with deferred clocking
ASoC: Mark WM8958 DSP2 registers readable
ASoC: Support download of WM8958 MBC firmware
ASoC: Refactor WM8958 DSP to support additional algorithms
ASoC: Add WM8958 VSS support
ASoC: Add WM8958 enhanced EQ support
ASoC: Convert WM8903 to table based DAPM setup
ASoC: Convert WM8731 to table based DAPM setup
ASoC: Remove -codec from WM8731 driver name
ASoC: Remove excessively verbose logging on I2C write
ASoC: Fix comment width in soc-cache.c
ASoC: Add bias level data to DAPM context debugfs
ASoC: Add data based control initialisation for CODECs and cards
ASoC: Remove special casing for registerless widgets
ASoC: Force all DAPM contexts into the same bias state
ASoC: Allow DAPM pin operations to match any context
ASoC: Add WM8915 CODEC driver
ASoC: Add initial WM1250-EV1 Springbank audio I/O module driver
ASoC: Fix mis cherry-pick of wm1250-ev1 driver
ASoC: Move WM8915 FLL operations onto the CODEC
ASoC: Create card DAPM widgets early so they can be used in callbacks
ASoC: Initial audio support for Speyside on Cragganmore 6410
ASoC: Add basic widgets for WM8915 Speyside
ASoC: Optimise clock management for WM8915 Speyside
ASoC: Support the sub speaker driver on Speyside
ASoC: Add Speyside headset jack detection support
ASoC: Add pin switches for fixed analogue inputs and outputs on Speyside
ASoC: Add stub baseband link on Speyside
ASoC: Mark Speyside widgets as ignoring suspend
ASoC: Remove default settings from Tegra Kconfig
ASoC: Support 24.576MHz MCLKs in WM8915
ASoC: Support FLL lock interrupt on WM8962
ASoC: Move WM8962 FLL configuration to CODEC
ASoC: Define constants for WM8962 GPIO functions
ASoC: Implement WM8962 DMIC support
ASoC: Don't warn if the WM8962 SYSCLK FLL setting doesn't match reality
ASoC: Allow platform drivers to have no ops structure
ASoC: Add more natural support for no-DMA DAIs
ASoC: Don't specify the DMA driver for Speyside baseband link
ASoC: Implement WM8962 ADC high pass filter configuration
ASoC: Work around allmodconfig failure
ASoC: Don't specify the DMA driver for OpenMoko baseband link
ASoC: Don't specify the DMA driver for Goni baseband link
ASoC: Use shared controls for input signal path in WM8915
ASoC: Remove outdated FIXME from WM8915
ASoC: Fix NULL vs. 0 warning in SSM2602
ASoC: Don't squash 16x8 registers down to 8 bits
ASoC: Remove byte swap in 4x12 SPI write
ASoC: Use spi_write() for SPI writes
ASoC: Disable WM8994/58 microphone detection over suspend
ASoC: Reintroduce do_spi_write()
ASoC: Ensure output PGA is enabled for line outputs in wm_hubs
ASoC: Add some missing volume update bit sets for wm_hubs devices
ASoC: Skip noop reconfiguration of WM8958 DSP2 algorithms
ASoC: Don't restart an already running WM8958 DSP2

Mathieu Bouffard (1):
ALSA: usb-audio - Add support for USB X-Fi S51 Pro

Mike Frysinger (8):
ASoC: fix sorting order of codecs in kconfig
ASoC: SSM2602: fix codec name
ASoC: ad73311: fix codec name
ASoC: ad193x: fix codec name
ASoC: ad1980: fix codec name
ASoC: Blackfin: drop "-codec" from codec names
ASoC: Blackfin: standardize machine driver names
ASoC: SSM2602: add SPI support

Mike Rapoport (1):
ASoC: tegra: TrimSlice machine support

Misael Lopez Cruz (1):
ASoC: DMIC codec - Add input widget

Ondrej Zary (12):
ALSA: tea575x-tuner: various improvements
ALSA: tea575x-tuner: remove dev_nr
ALSA: es1968: add radio (tea575x tuner) support [media] remove radio-maestro
ALSA: tea575x: unify read/write functions
ALSA: es1968: convert TEA575x support to new interface
ALSA: fm801: convert TEA575x support to new interface
ALSA: fm801: implement TEA575x tuner autodetection
ALSA: tea575x: remove freq_fixup from struct
ALSA: tea575x: remove unused card from struct
ALSA: tea575x: use better card and bus names
ALSA: fm801: clean-up radio-related Kconfig

Peter Hsiang (2):
ASoC: Add max98095 CODEC driver
ASoC: Add EQ and filter to max98095 CODEC driver

Peter Ujfalusi (9):
ASoC: tlv320dac33: Move codec power up to DAPM
ASoC: tlv320dac33: Lower the OSC calibration time
ASoC: tlv320dac33: Update e-mail address
ASoC: tpa6130a2: Update e-mail address
ASoC: omap-mcbsp: Update e-mail address
ASoC: omap-pcm: Update e-mail address
ASoC: RX51: Update e-mail address
MAINTAINERS: Update e-mail address for asoc/twl4030
ASoC: omap-pcm: Period wakeup disabling on OMAP2+

Ralf Baechle (1):
SOUND: OSS: Remove Au1550 driver.

Randy Dunlap (2):
ALSA: lola - fix lola build
ASoC: fix wm8958-dsp2 printk format warnings

Raymond Yau (7):
ALSA: hda - Fix alc662_dac_nid and change "6stack-dig" to "5stack-dig"
ALSA: emu10k1 - Remove CLFE-related controls for SB Live! Platinum CT4760P
ALSA: emu10k1 - Remove "Front" controls only for STAC9758/59
ALSA: au88x0 - Use a better name for pcm devices of au88x0
ALSA: hda - fix NULL-dereference in patch_realtek
ALSA: hda - Remove PCM mixer elements from Virtual Master of realtek
ALSA: emu10k1 - Add dB range to Bass and Treble for SB Live!

Risto Suominen (1):
ALSA: powermac - Correct lineout detection on PowerMac G4 DA

Sangbeom Kim (1):
ASoC: SAMSUNG: Add WM8580 PCM Machine driver

Sanjeev Premi (1):
ASoC: omap-mcbsp: Remove restrictive checks for cpu type

Scott Jiang (3):
ASoC: ad193x: tweak style to match other codecs
ASoC: ad73311: drop I2C requirement
ASoC: Blackfin: add ad193x sysclk configuration

Seth Heasley (1):
ALSA: hda - ALSA HD Audio patch for Intel Panther Point DeviceIDs

Seungwhan Youn (1):
ASoC: Fix to avoid compile error

Stefan Richter (2):
ALSA: isight: add AudioEnable register write
ALSA: isight: wrap up register accesses

Stephen Boyd (1):
ASoC: Silence DEBUG_STRICT_USER_COPY_CHECKS=y warning

Stephen Warren (22):
ASoC: Name jack GPIOs based on jack not codec
ARM: Tegra: Rename harmony_audio.h -> tegra_wm8903_pdata.h
ASoC: Tegra: Rename pdev tegra-snd-harmony to tegra-snd-wm8903
ARM: Tegra: Add to tegra_wm8903_platform_data
ASoC: Tegra: Rename harmony.c to tegra_wm8903.c
ASoC: Tegra: Rename Kconfig SND_TEGRA_SOC_* to SND_SOC_TEGRA_*
ASoC: Tegra: Don't store snd_soc_jack_gpio in an array
ASoC: Tegra: Support more boards
ASoC: Tegra: wm8903 probe: Don't call machine_is_*()
ASoC: Tegra: wm8903: Remove redundant drvdata clears
ASoC: Tegra: Don't return mclk_changed from utils_set_rate
ASoC: Tegra: Retrieve card from DAPM context not codec
ASoC: snd_soc_dapm_get_pin_status: Match other contexts too
ASoC: Tegra: wm8903: s/code/data/ for control/widget/maps
ASoC: WM8903: Implement DMIC support
ARM: Tegra: select MACH_HAS_SND_SOC_TEGRA_WM8903
ASoC: s/w->kcontrols/w->kcontrol_news/g
ASoC: Add w->kcontrols, and populate it
ASoC: Store a list of widgets in a DAPM mux/mixer kcontrol
ASoC: Implement mux control sharing
ASoC: spdif-dit: Add missing MODULE_*
ASoC: Tegra: Fix compile when debugfs not enabled

Takashi Iwai (86):
ALSA: core - Don't use "default' for default
ALSA: hda - Correct initial dac_nids for some ALC272-quirks
ALSA: hda - Fix mix->DAC deduction for ALC892
ALSA: hda - Split EAPD init to a separate array from alc662_init_verbs
ALSA: hda - Refactoring EAPD controls
ALSA: hda - Introduce shutup callback to Realtek spec struct
ALSA: hda - Rewrite alc269_suspend to alc269_shutup
ALSA: hda - Unmute mixer dynamically in alc662 auto-parser
ALSA: hda - Mute ADC as default in ALC882 and other auto-parsers
ALSA: hda - Remove superfluous inits for ALC662 auto-parser
ALSA: hda - Fix unused variable warning in patch_realtek.c
ALSA: hda - Remember connection lists
ALSA: asihpi - Use %zd for size_t argument in error message (again)
ALSA: hda - Enable sync_write for AMD chipset with IDT 92HD8x codecs
ALSA: hda - Move EAPD power-down into shutup callback for AD codecs
ALSA: hda - Enable sync_write workaround for AMD generically
ALSA: hda - Minor update for alc662-parser functions
ALSA: hda - Add channel-mode support to Realtek auto-parser
ALSA: usb-audio - Don't expose broken dB ranges
ALSA: hda - Consolidate default automute functions for Realtek
ALSA: hda - Add common automute support for mxier-amp on/off for Reatek
ALSA: hda - Add support of line-out automute for Realtek
ALSA: hda - Consolidate auto-mute with master-switch for Realtek
ALSA: hda - More reduction of redundant automute codes in Realtek parser
ALSA: hda - Add support for Line-Out automute to Realtek auto-parser
ALSA: hda - More line-out auto-mute support for Realtek
ALSA: hda - Add Auto-Mute Mode enum for two-output cases
ALSA: hda - Show the line-out type in snd_hda_parse_pin_def_config()
ALSA: hda - Constify some API function arguments
ALSA: hda - Constify fixup and other array data in patch_realtek.c
ALSA: hda - Constify some API function arguments
ALSA: hda - Constify fixup and other array data in patch_realtek.c
ALSA: hda - Constify fixup and other array data in patch_analog.c
ALSA: hda - Constify fixup and other array data in patch_cmedia.c
ALSA: hda - Constify fixup and other array data in patch_ca0110.c
ALSA: hda - Constify fixup and other array data in patch_cirrus.c
ALSA: hda - Constify fixup and other array data in patch_conexant.c
ALSA: hda - Constify fixup and other array data in patch_hdmi.c
ALSA: hda - Constify fixup and other array data in patch_si3054.c
ALSA: hda - Constify fixup and other array data in patch_sigmatel.c
ALSA: hda - Constify fixup and other array data in patch_via.c
ASoC: Declare const properly for enum texts
ALSA: Add the driver for Digigram Lola PCI-e boards
ALSA: lola - Make SRC helper global
ALSA: lola - Changes in proc file
ALSA: lola - Suppress the debug print
ALSA: lola - Use a single BDL
ALSA: lola - Fix PCM stalls
ALSA: lola - Add Lola-specific module options
ALSA: lola - Use SG-buffer
ALSA: lola - Allow granularity changes
ALSA: lola - Add SRC refcounting
ALSA: lola - Add sync in loop implementation
ALSA: lola - Rename to Digital SRC Capture Switch
ALSA: lola - Implement polling_mode like hd-audio
ALSA: lola - Add missing inclusion of linux/delay.h
ALSA: lola - Yet another linux/delay.h inclusion
ALSA: hda - Use position_fix=3 as default for AMD chipsets
ALSA: hda - Fix auto-mic for CX2064x codecs
ALSA: hda - Turn on EAPD dynamically per jack plug in Conexant auto mode
ALSA: hda - Check AMP CAP at initialization of Conexant auto-parser
ALSA: hda - Add auto-parser support to cxt5051 / CX20561 Hermosa
ALSA: hda - Add auto-parser support to cxt5045 / CX20549 Venice
ALSA: hda - Clean up input-mux handling in Conexant auto-parser
ALSA: hda - Parse more deep input-source routes in Conexant auto-parser
ALSA: hda - Add support of auto-parser to cxt5047 / CX20551 Waikiki
ALSA: hda - Search ADC NIDs dynamically in Conexant auto-parser
ALSA: hda - Enable codec->pin_amp_workaround always for Conexant auto-parser
ALSA: hda - Don't use auto-parser for cxt5045 / 5051 as default
ALSA: hda - Build boost controls from selector widget in Cxt auto-parser
ALSA: hda - Don't create multiple same volume/boost controls in Cxt auto-parser
ALSA: hda - Add support of auto-parser to cxt5066 codecs
ALSA: hda - Code refactoring in patch_conexant.c
ALSA: hda - Add missing Front/Surround/CLFE as slaves for Cxt auto-parser
ALSA: hda - Add automute-mode enum to Conexant auto-parser
ALSA: hda - Use is_jack_detectable() helper
ALSA: hda - Use get_wcaps_type()
ALSA: hda - Fix initialization of spec->automute_lines in patch_realtek.c
ALSA: hda - Add support of dock-mic detection to Conexant auto-parser
ALSA: hda - Check unsol-cap in is_jack_detectalbe()
ALSA: hda - Add dock-mic detection support to Realtek auto-parser
ALSA: hda - Handle dock line-in as auto-detectable for IDT codecs
ALSA: hda - Handle dock line-in as auto-detecable for Cxt auto-parser
ALSA: hda - Enable snoop bit for AMD controllers
Revert "ALSA: hda - Use position_fix=3 as default for AMD chipsets"
ALSA: hda - Use LPIB for ATI/AMD chipsets as default

Taylor Hutt (1):
ASoC: Max98095: Move existing NULL check before pointer dereference.

Torsten Schenk (5):
ALSA: 6fire - Update kernel configuration
ALSA: 6fire - Fix pcm rate assignment
ALSA: 6fire - Add support for S32_LE format
ALSA: 6fire - Improve firmware loader
ALSA: 6fire - Add support of digital-thru mixer

Wolfram Sang (1):
ASoC: imx: remove superfluous code in imx-ssi.c

Wu Fengguang (1):
ALSA: hda - add Intel Panther Point HDMI codec id

---
 Documentation/sound/alsa/ALSA-Configuration.txt    |    7 +
 Documentation/sound/alsa/HD-Audio-Models.txt       |    2 +-
 MAINTAINERS                                        |   13 +-
 arch/arm/mach-tegra/Kconfig                        |    3 +
 arch/arm/mach-tegra/board-harmony.c                |    7 +-
 .../mach/{harmony_audio.h => tegra_wm8903_pdata.h} |    5 +-
 drivers/media/radio/Kconfig                        |   15 -
 drivers/media/radio/Makefile                       |    1 -
 drivers/media/radio/radio-maestro.c                |  452 ---
 .../staging/intel_sst/intel_sst_drv_interface.c    |    1 -
 drivers/staging/intel_sst/intelmid.c               |    4 +
 include/linux/mfd/wm8994/pdata.h                   |   49 +
 include/sound/ak4641.h                             |   26 +
 include/sound/control.h                            |    1 +
 include/sound/max98095.h                           |   54 +
 include/sound/soc-dapm.h                           |   80 +-
 include/sound/soc.h                                |   32 +-
 include/sound/tea575x-tuner.h                      |   26 +-
 include/sound/tlv320dac33-plat.h                   |    2 +-
 include/sound/tpa6130a2-plat.h                     |    2 +-
 include/sound/wm8915.h                             |   55 +
 include/sound/wm8962.h                             |   22 +
 sound/core/control.c                               |   64 +
 sound/core/init.c                                  |    2 +-
 sound/core/pcm_lib.c                               |   14 +-
 sound/firewire/Kconfig                             |   11 +
 sound/firewire/Makefile                            |    2 +
 sound/firewire/isight.c                            |  755 ++++
 sound/firewire/iso-resources.c                     |    5 +
 sound/firewire/packets-buffer.c                    |    2 +
 sound/i2c/other/Makefile                           |    2 +-
 sound/i2c/other/tea575x-tuner.c                    |  153 +-
 sound/oss/Kconfig                                  |    4 -
 sound/oss/Makefile                                 |    1 -
 sound/oss/ac97_codec.c                             | 1203 -------
 sound/oss/au1550_ac97.c                            | 2147 -----------
 sound/pci/Kconfig                                  |   27 +-
 sound/pci/Makefile                                 |    1 +
 sound/pci/asihpi/asihpi.c                          |  328 +-
 sound/pci/asihpi/hpi6000.c                         |   39 +-
 sound/pci/asihpi/hpi6205.c                         |   95 +-
 sound/pci/asihpi/hpi_internal.h                    |   19 +-
 sound/pci/asihpi/hpicmn.c                          |   10 +-
 sound/pci/asihpi/hpicmn.h                          |    2 +
 sound/pci/asihpi/hpifunc.c                         |   27 -
 sound/pci/asihpi/hpimsgx.c                         |   31 +-
 sound/pci/asihpi/hpioctl.c                         |   63 +-
 sound/pci/au88x0/au8810.h                          |    2 +-
 sound/pci/au88x0/au8820.h                          |    2 +-
 sound/pci/au88x0/au8830.h                          |    2 +-
 sound/pci/au88x0/au88x0_pcm.c                      |   13 +-
 sound/pci/emu10k1/emufx.c                          |    5 +
 sound/pci/emu10k1/emumixer.c                       |   10 +-
 sound/pci/es1968.c                                 |   78 +
 sound/pci/fm801.c                                  |  371 +--
 sound/pci/hda/hda_codec.c                          |   97 +-
 sound/pci/hda/hda_codec.h                          |    4 +-
 sound/pci/hda/hda_intel.c                          |   38 +-
 sound/pci/hda/hda_local.h                          |   16 +-
 sound/pci/hda/patch_analog.c                       |  345 +-
 sound/pci/hda/patch_ca0110.c                       |   16 +-
 sound/pci/hda/patch_cirrus.c                       |   52 +-
 sound/pci/hda/patch_cmedia.c                       |   40 +-
 sound/pci/hda/patch_conexant.c                     | 1085 +++++--
 sound/pci/hda/patch_hdmi.c                         |   39 +-
 sound/pci/hda/patch_realtek.c                      | 3721 ++++++++++----------
 sound/pci/hda/patch_si3054.c                       |   11 +-
 sound/pci/hda/patch_sigmatel.c                     |  431 ++--
 sound/pci/hda/patch_via.c                          | 1526 +++++----
 sound/pci/intel8x0m.c                              |    4 +-
 sound/pci/lola/Makefile                            |    4 +
 sound/pci/lola/lola.c                              |  791 +++++
 sound/pci/lola/lola.h                              |  527 +++
 sound/pci/lola/lola_clock.c                        |  323 ++
 sound/pci/lola/lola_mixer.c                        |  839 +++++
 sound/pci/lola/lola_pcm.c                          |  706 ++++
 sound/pci/lola/lola_proc.c                         |  222 ++
 sound/ppc/tumbler.c                                |    2 +-
 sound/soc/atmel/sam9g20_wm8731.c                   |    2 +-
 sound/soc/au1x/db1200.c                            |    2 +-
 sound/soc/blackfin/bf5xx-ac97-pcm.c                |   13 +-
 sound/soc/blackfin/bf5xx-ac97.c                    |  166 +-
 sound/soc/blackfin/bf5xx-ad1836.c                  |   42 +-
 sound/soc/blackfin/bf5xx-ad193x.c                  |   56 +-
 sound/soc/blackfin/bf5xx-ad1980.c                  |   45 +-
 sound/soc/blackfin/bf5xx-ad73311.c                 |   42 +-
 sound/soc/blackfin/bf5xx-i2s-pcm.c                 |   23 +-
 sound/soc/blackfin/bf5xx-i2s.c                     |  172 +-
 sound/soc/blackfin/bf5xx-sport.c                   |  159 +-
 sound/soc/blackfin/bf5xx-sport.h                   |   16 +-
 sound/soc/blackfin/bf5xx-ssm2602.c                 |   42 +-
 sound/soc/blackfin/bf5xx-tdm-pcm.c                 |   23 +-
 sound/soc/blackfin/bf5xx-tdm.c                     |  110 +-
 sound/soc/codecs/88pm860x-codec.c                  |    2 +-
 sound/soc/codecs/Kconfig                           |   20 +-
 sound/soc/codecs/Makefile                          |   10 +-
 sound/soc/codecs/ad193x.c                          |   23 +-
 sound/soc/codecs/ad1980.c                          |    2 +-
 sound/soc/codecs/ad73311.c                         |    2 +-
 sound/soc/codecs/ak4535.c                          |   19 +-
 sound/soc/codecs/ak4641.c                          |  664 ++++
 sound/soc/codecs/ak4641.h                          |   47 +
 sound/soc/codecs/ak4671.c                          |   18 +-
 sound/soc/codecs/cx20442.c                         |   18 +-
 sound/soc/codecs/dmic.c                            |   26 +-
 sound/soc/codecs/jz4740.c                          |   18 +-
 sound/soc/codecs/max98088.c                        |   87 +-
 sound/soc/codecs/max98088.h                        |   13 +
 sound/soc/codecs/max98095.c                        | 2396 +++++++++++++
 sound/soc/codecs/max98095.h                        |  299 ++
 sound/soc/codecs/sn95031.c                         |   17 +-
 sound/soc/codecs/spdif_transciever.c               |    8 +-
 sound/soc/codecs/ssm2602.c                         |  464 ++--
 sound/soc/codecs/ssm2602.h                         |    6 -
 sound/soc/codecs/tlv320aic23.c                     |   19 +-
 sound/soc/codecs/tlv320aic3x.c                     |    3 +-
 sound/soc/codecs/tlv320dac33.c                     |   17 +-
 sound/soc/codecs/tlv320dac33.h                     |    2 +-
 sound/soc/codecs/tpa6130a2.c                       |    4 +-
 sound/soc/codecs/tpa6130a2.h                       |    2 +-
 sound/soc/codecs/twl6040.c                         |    6 +-
 sound/soc/codecs/wm1250-ev1.c                      |  108 +
 sound/soc/codecs/wm8711.c                          |   18 +-
 sound/soc/codecs/wm8728.c                          |   18 +-
 sound/soc/codecs/wm8731.c                          |   22 +-
 sound/soc/codecs/wm8903.c                          |   44 +-
 sound/soc/codecs/wm8915.c                          | 2931 +++++++++++++++
 sound/soc/codecs/wm8915.h                          | 3717 +++++++++++++++++++
 sound/soc/codecs/wm8958-dsp2.c                     | 1051 ++++++
 sound/soc/codecs/wm8962.c                          |   63 +-
 sound/soc/codecs/wm8993.c                          |    3 +-
 sound/soc/codecs/wm8994.c                          |  395 +--
 sound/soc/codecs/wm8994.h                          |   97 +
 sound/soc/codecs/wm8995.c                          |    4 +-
 sound/soc/codecs/wm9705.c                          |   18 +-
 sound/soc/codecs/wm9712.c                          |   18 +-
 sound/soc/codecs/wm9713.c                          |   19 +-
 sound/soc/codecs/wm_hubs.c                         |   24 +-
 sound/soc/davinci/davinci-mcasp.c                  |    2 +
 sound/soc/imx/imx-ssi.c                            |    6 -
 sound/soc/jz4740/qi_lb60.c                         |   46 +-
 sound/soc/mid-x86/sst_platform.c                   |    4 +
 sound/soc/omap/omap-mcbsp.c                        |    6 +-
 sound/soc/omap/omap-mcbsp.h                        |    2 +-
 sound/soc/omap/omap-pcm.c                          |    7 +-
 sound/soc/omap/omap-pcm.h                          |    2 +-
 sound/soc/omap/rx51.c                              |    2 +-
 sound/soc/pxa/Kconfig                              |    9 +
 sound/soc/pxa/Makefile                             |    2 +
 sound/soc/pxa/corgi.c                              |    2 +-
 sound/soc/pxa/hx4700.c                             |  255 ++
 sound/soc/pxa/poodle.c                             |    2 +-
 sound/soc/pxa/spitz.c                              |   41 +-
 sound/soc/samsung/Kconfig                          |   15 +
 sound/soc/samsung/Makefile                         |    4 +
 sound/soc/samsung/goni_wm8994.c                    |    1 -
 sound/soc/samsung/neo1973_wm8753.c                 |    1 -
 sound/soc/samsung/smdk_wm8580pcm.c                 |  206 ++
 sound/soc/samsung/speyside.c                       |  332 ++
 sound/soc/sh/fsi.c                                 |  188 +-
 sound/soc/soc-cache.c                              |  612 +---
 sound/soc/soc-core.c                               |  191 +-
 sound/soc/soc-dapm.c                               |  611 ++--
 sound/soc/soc-jack.c                               |    2 +-
 sound/soc/soc-utils.c                              |   53 +
 sound/soc/tegra/Kconfig                            |   38 +-
 sound/soc/tegra/Makefile                           |   14 +-
 sound/soc/tegra/harmony.c                          |  394 ---
 sound/soc/tegra/tegra_asoc_utils.c                 |    9 +-
 sound/soc/tegra/tegra_asoc_utils.h                 |    2 +-
 sound/soc/tegra/tegra_i2s.c                        |    2 +-
 sound/soc/tegra/tegra_wm8903.c                     |  475 +++
 sound/soc/tegra/trimslice.c                        |  228 ++
 sound/usb/6fire/control.c                          |  105 +
 sound/usb/6fire/control.h                          |   17 +
 sound/usb/6fire/firmware.c                         |   73 +-
 sound/usb/6fire/pcm.c                              |   97 +-
 sound/usb/Kconfig                                  |   10 +-
 sound/usb/clock.c                                  |   11 +-
 sound/usb/debug.h                                  |    2 +-
 sound/usb/format.c                                 |    1 +
 sound/usb/mixer.c                                  |   10 +-
 sound/usb/mixer_quirks.c                           |   12 +
 sound/usb/quirks-table.h                           |   47 +-
 sound/usb/quirks.c                                 |    1 +
 185 files changed, 24479 insertions(+), 10536 deletions(-)
 rename arch/arm/mach-tegra/include/mach/{harmony_audio.h => tegra_wm8903_pdata.h} (83%)
 delete mode 100644 drivers/media/radio/radio-maestro.c
 create mode 100644 include/sound/ak4641.h
 create mode 100644 include/sound/max98095.h
 create mode 100644 include/sound/wm8915.h
 create mode 100644 sound/firewire/isight.c
 delete mode 100644 sound/oss/ac97_codec.c
 delete mode 100644 sound/oss/au1550_ac97.c
 create mode 100644 sound/pci/lola/Makefile
 create mode 100644 sound/pci/lola/lola.c
 create mode 100644 sound/pci/lola/lola.h
 create mode 100644 sound/pci/lola/lola_clock.c
 create mode 100644 sound/pci/lola/lola_mixer.c
 create mode 100644 sound/pci/lola/lola_pcm.c
 create mode 100644 sound/pci/lola/lola_proc.c
 create mode 100644 sound/soc/codecs/ak4641.c
 create mode 100644 sound/soc/codecs/ak4641.h
 create mode 100644 sound/soc/codecs/max98095.c
 create mode 100644 sound/soc/codecs/max98095.h
 create mode 100644 sound/soc/codecs/wm1250-ev1.c
 create mode 100644 sound/soc/codecs/wm8915.c
 create mode 100644 sound/soc/codecs/wm8915.h
 create mode 100644 sound/soc/codecs/wm8958-dsp2.c
 create mode 100644 sound/soc/pxa/hx4700.c
 create mode 100644 sound/soc/samsung/smdk_wm8580pcm.c
 create mode 100644 sound/soc/samsung/speyside.c
 delete mode 100644 sound/soc/tegra/harmony.c
 create mode 100644 sound/soc/tegra/tegra_wm8903.c
 create mode 100644 sound/soc/tegra/trimslice.c