Hi,

I've been slowly recovered from the long off, and gathering the patches for pushing to 2.6.38 merge. I'm going to send a pull request tomorrow or the next day. The below is the list of commits for now.

If anyone has a patch to be merged but missing here, please let me know (at best resend to me).

Mark, Liam, do you guys have still many pending updates? If so, please forward quickly. Also, if a brief summary of this merge in ASoC area is ready, it'd be helpful.

thanks,

Takashi

=== Alexander Sverdlin (1): ASoC: EP93xx: sampling rate range extended

Andreas Mohr (7): ALSA: azt3328: period bug fix (for PA), add missing ACK on stop timer ALSA: azt3328: cosmetics, minor updates ALSA: azt3328: _setfmt() update ALSA: azt3328: cosmetics: use a helper variable for codec setup ALSA: azt3328: use a helper variable to remove one indirection in hotpath ALSA: azt3328: use proper private_data hookup for codec identification ALSA: azt3328: improve snd_azf3328_codec_setdmaa()

Anisse Astier (1): ALSA: hda - factorize an automute_mic realtek quirk function

Anssi Hannula (1): ALSA: hda - use generic hdmi parser for ATI R6xx codec

Arnaud Patard (3): ASoC: add support for alc562[123] codecs ASoC: kirkwood: Add audio support to hp t5325 thin clients ASoC: Add support for OpenRD Ultimate

Axel Lin (21): ASoC: Fix compile error if CONFIG_DEBUG_FS is not configured ASoC: Fix incorrect kfree in ad1836_probe error path ASoC: Fix incorrect kfree in ad193x_probe error path ASoC: Fix incorrect kfree in aic3x_probe error path ASoC: Fix incorrect kfree in wm8731_probe error path ASoC: Fix incorrect kfree in wm8962_probe error path ASoC: Move kfree(twl4030) to twl4030_soc_remove() ASoC: Fix a memory leak in alc5623_i2c_probe error path ASoC: neo1973_gta02_wm8753: fix wrong parameter for snd_soc_register_dai and snd_soc_unregister_dai ASoC: Fix compile error for smartq_wm8987.c ASoC: smdk_wm9713: fix resource leak in smdk_init error path ASoC: Fix resource leak in goni_wm8994.c ASoC: Fix resource leak in neo1973_gta02_init() error path ASoC: Add missing gpio_free(S3C64XX_GPK(12)) in smartq_exit() ASoC: Fix resource leak in smdk_spdif.c ASoC: Simplify pm860x_probe error handling ASoC: ak4535: Improve readability for setting mute ASoC: Remove unused aic3x_i2c_init and aic3x_i2c_exit functions ASoC: Fix inconsistent meaning of default case while checking alc5623->id ASoC: Fix snd_soc_instantiate_card error path ALSA: aoa: Remove wrong i2c_set_clientdata in onyx_i2c_remove()

Brian Bloniarz (1): ALSA: ice1712 - working M-Audio Delta 66E support

Clemens Ladisch (46): ALSA: oxygen: merge HiFier driver into snd-oxygen ALSA: oxygen: add Kuroutoshikou CMI8787-HG2PCI support ALSA: oxygen: reorganize PCI IDs ALSA: oxygen: add HiFier Serenade support ALSA: pcm: support for period wakeup disabling ALSA: hda-intel: support for period wakeup disabling ALSA: oxygen: support for period wakeup disabling ALSA: pcm: detect xruns in no-period-wakeup mode ALSA: pcm: optimize xrun detection in no-period-wakeup mode ALSA: timer: automatically load the high-resolution timer ALSA: virtuoso: initialize unknown GPIO bits ALSA: virtuoso: add HDMI enable switch for HDAV1.3 ALSA: virtuoso: fix front panel routing for D1/DX/ST(X) ALSA: oxygen: allow to dump codec registers ALSA: oxygen: show correct package ID ALSA: oxygen: update hardware comments ALSA: oxygen: allow different number of PCM and mixer channels ALSA: oxygen: remove oxygen_model::private_data field ALSA: oxygen: fix SPI clocks slower than 6.25 MHz ALSA: virtuoso: do not use fast I2C speed ALSA: virtuoso: wait for PCM1796 clock to become stable ALSA: virtuoso: change PCM1796 format to I2S ALSA: virtuoso: remove non-working controls on Essence ST Deluxe ALSA: virtuoso: configure correct master clock frequency on the CS2000 ALSA: virtuoso: use lower master clock with H6 daughterboard ALSA: virtuoso: handle DAC oversampling automatically ALSA: virtuoso: use headphone gain setting only on front DAC ALSA: oxygen: simplify model-specific MCLK handling ALSA: virtuoso: reduce MCLK in double rate modes ALSA: oxygen: add more PCI IDs ALSA: oxygen: add X-Meridian 2G support ALSA: oxygen: add Xonar DG support ALSA: virtuoso: add Xonar HDAV1.3 Slim support ALSA: core, oxygen, virtuoso: add an enum control info helper ALSA: bt87x: use enum control info helper ALSA: cmipci: use enum control info helper ALSA: ymfpci: use enum control info helper ALSA: usb-audio: use enum control info helper ALSA: usb-audio: add Edirol SD-90 PCM support MAINTAINERS: add myself ALSA: oxygen: add digital input validity check switch ALSA: oxygen: X-Meridian: add S/PDIF source selection ALSA: oxygen: do not show chip revision in card longname ALSA: oxygen: add some card names ALSA: oxygen: fix CD/MIDI for X-Meridian (2G) ALSA: oxygen: add S/PDIF source selection for Claro cards

Daniel T Chen (3): ALSA: hda: Add Samsung R720 SSID for subwoofer pin fixup ALSA: hda: Use hp-laptop quirk to enable headphones automute for Asus A52J ALSA: hda: Use vostro model quirk for Dell Vostro 1014

David Henningsson (9): ALSA: HDA: Create mixers on ALC887 ALSA: HDA: Remove unconnected PCM devices for Intel HDMI ALSA: HDA: Rename "Int Mic" to "Internal Mic" ALSA: HDA: Rename "Ext Mic" and "External Mic" to "Mic" ALSA: HDA: Rename "e-Mic" and "i-Mic" to "Mic" and "Internal Mic" ALSA: HDA: Add internal mic for IDT 92HD88B ALSA: HDA: Rename "Mic Boost" to "Mic Boost Volume" ALSA: HDA: Fix volume control indices for Mics (Realtek) ALSA: HDA: Add Lenovo vendor quirk for Conexant 205xx

Dimitris Papastamos (22): ASoC: soc-cache: Remove unnecessary debugging info ASoC: WM8770: Initial driver ASoC: soc-cache: Use BUG_ON() for unsupported hw_read() calls ASoC: Remove unneeded use of address-of operator ASoC: soc-cache: Add support for flat register caching ASoC: soc-cache: Add support for LZO register caching ASoC: soc-cache: Add support for rbtree based register caching ASoC: soc-cache: Add error checking in the *_cache_sync functions ASoC: soc-cache: Ensure consistent cache naming ASoC: soc-cache: Fix memory overflow in LZO initialization ASoC: Add compress_type as a member to snd_soc_codec ASoC: Change the base value of compress_type ASoC: soc-core: Generalize snd_soc_prefix_map and rename to snd_soc_codec_conf ASoC: soc-cache: Use reg_def_copy instead of reg_cache_default ASoC: soc-core: Allow machine drivers to override compress_type ASoC: soc-cache: Add optional cache name member to snd_soc_cache_ops ASoC: soc-core: Replace use of strncpy() with strlcpy() ASoC: soc-core: Remove useless inline function construct ASoC: soc-core: Fix null pointer dereference ASoC: soc-cache: A few minor stylistic changes ASoC: soc-dapm: Introduce the new snd_soc_dapm_virt_mux type ASoC: Add initial WM8995 driver

Florian Faber (1): ALSA: hdsp - Add support for RPM io box

Francois Mazard (1): ASoC: twl6040: Fix analog Mic L & R mux controls

Harsha Priya (1): ASoC: Fix the device references to codec and platform drivers

Jarkko Nikula (23): ASoC: Fix SND_SOC_ALL_CODECS typo for alc5623 ASoC: tlv320aic3x: Use gpio_is_valid in checking for valid gpio_reset ASoC: tlv320aic3x: Add support to shared common reset line ASoC: Add sound card directory under debugfs/asoc/ ASoC: Move codec debugfs directories under parent card directory ASoC: Move pop time from DAPM context to sound card ASoC: tpa6130a2: Revisit power-up sequence ASoC: Update DAPM debug and error prints ASoC: Convert pop_dbg to use dev_info ASoC: Add optional name_prefix for codec kcontrol, widget and route names ASoC: Fix compile breakage in jz4740.c and smartq_wm8987.c ASoC: Do not include soc-dapm.h ASoC: Do not include soc-dai.h ASoC: Remove cyclic dependency between soc.h and soc-dapm.h/soc-dai.h ASoC: Add support for optional auxiliary dailess codecs ASoC: Fix build failure in soc-core.c ASoC: Don't oops in soc_probe_aux_dev in case of missing codec ASoC: Merge common code in DAI link and auxiliary codec probing/removal ASoC: Fix build error caused by merging a fix for 2.6.37 into 2.6.38 ASoC: Move DAPM paths from DAPM context to snd_soc_card ASoC: Move widgets from DAPM context to snd_soc_card ASoC: Extend DAPM to handle power changes on cross-device paths ASoC: Remove needless inclusion of tlv320aic3x.h from machine drivers

Jassi Brar (38): ARM: S5PV310: Add platform devices for PL330 DMACs ARM: SAMSUNG: Rename s3c64xx I2S platform device ARM: SAMSUNG: Prepare audio header for new I2S driver ARM: S3C64XX: Upgrade platform device for I2S ARM: S5P64X0: Upgrade platform device for I2S ARM: S5P6442: Upgrade platform device for I2S ARM: S5PC100: Upgrade platform device for I2S ARM: S5PV210: Upgrade platform device for I2S ARM: S5PV310: Add audio platform devices ASoC: Samsung: Remove redundant AQUILA driver ASoC: Samsung: Rename DMA device ARM: Samsung: Define common audio-dma device ASoC: Samsung: Rename ASoC DMA driver ASoC: Samsung: Rename AC97 platform device ASoC: Samsung: Rename AC97 driver ASoC: Samsung: Rename PCM driver ASoC: Samsung: Generalize DMA driver namespace ASoC: Samsung: Rename s3c64xx I2S device ASoC: Samsung: Add common I2S driver ASoC: SMARTQ: Move to use new I2S driver ASoC: GONI: Move to use new I2S driver ASoC: SMDK64XX: Move to use new I2S driver ASoC: S3C64XX: Remove obsoleted I2S drivers ASoC: SMDK64XX: Rename for other platforms ASoC: SMDK_WM8580: Enable for SMDKC100 ASoC: Samsung: Generalize Kconfig symbols ASoC: Samsung: Rename from s3c24xx to samsung ASoC: WM8580: Debug interface index ASoC: Samsung: Set default rclk source rate ASoC: Samsung: I2S: Flush FIFO after stop ASoC: SMDK_WM8580: Make I2S0 as default dai ASoC: SMDK6440: Enable I2S device ASoC: SMDK6450: Enable I2S device ASoC: SMDK6442: Enable I2S device ASoC: SMDKV210: Enable I2S device ASoC: SMDKC110: Enable I2S device ASoC: SMDKV310: Enable AC97 device ASoC: SMDKV310: Add I2S support

Jeffrin Jose (1): sound: Fixed line limit issue in sound/ac97_bus.c

Jesper Juhl (1): ALSA: Don't leak in sound/core/oss/pcm_oss.c::snd_pcm_hw_param_near()

Joe Perches (2): ASoC: Remove unnecessary semicolons ALSA: ml403-ac97cr: Use vsprintf extension %pR for struct resource

Jorge Eduardo Candelaria (6): ASoC: sdp4430: Enable FM stereo pins ASoC: twl6040: Add jack support for headset and handset ASoC: sdp4430: Add Jack support ASoC: twl6040: Add headset and handset mux controls ASoC: twl6040: Clear interrupt status at boot time ASoC: twl6040: Increase timeout for power up

Karsten Wiese (2): ALSA: snd-usb-us122l: Fix MIDI output ALSA: snd-usb-us122l: Fix missing NULL checks

Kay Sievers (1): ALSA: support module on-demand loading for seq and timer

Kuninori Morimoto (13): ASoC: sh: fsi-ak4642: Add FSI port and ak464x selection ASoC: sh: fsi-ak4642: tidyup unnecessary variables ASoC: sh: fsi-ak4642: midify card name ASoC: sh: fsi: clean up SPDIF defines ASoC: sh: fsi: remove fsi_master_write ASoC: sh: fsi: change fsi->mst_ctrl to master->a/b_mclk ASoC: sh: fsi: remove runtime register check from fsi_reg_xxx ASoC: sh: fsi: remove runtime register check from fsi_master_xxx ASoC: sh: fsi: move fsi_irq_enable function to fsi_dai_trigger ASoC: sh: fsi: Add over/under run counter ASoC: sh: fsi: modify improper dependent fbdev: sh_mobile_hdmi: fixup compile error ASoC: sh: fsi-da7210: remove unnecessary format settings

Lars-Peter Clausen (1): ASoC: codecs: Remove unused reg_cache fields from device structs

Liam Girdwood (1): ASoC: Decouple DAPM from CODECs

Margarita Olaya Cabrera (1): ASoC: twl6040: Add ramp up/down volume for HS and HF

Mario Becroft (1): ASoC: Optimise WM9081 FLL performance

Mark Brown (69): ASoC: Store DC offset correction for wm_hubs devices in class W mode ASoC: Convert soc-jack code to use request_any_context_irq() ASoC: Push snd_soc_write() and snd_soc_read() into the source file ASoC: Remove register write trace from WM8994 ASoC: Use pm_wakeup_event() in WM8962 jack detection ASoC: Factor out boiler plate for DAPM event generation ASoC: Add trace events for ASoC register read/write ASoC: Add DAPM trace events ASoC: Reset WM8962 with default ID value ASoC: Prevent system suspend while debouncing wakeup capable GPIO jacks ASoC: Use DAPM context rather than CODEC when constructing sequences ASoC: Provide ADC left/right channel source selection on WM8994 ASoC: Move WM8994 read/write access data into separate file ASoC: Add initial WM8737 driver ASoC: Make SMDK WM8580 driver unloadable ASoC: Update MAINTAINERS for Samsung driver move ASoC: Add WM8737 ALC support ARM: Samsung: Make sure ASoC DMA device is prototyped ASoC: Remove redundant hw_write initialisation in WM8737 mfd: Add initial WM8958 support gpiolib: Add WM8958 support to the WM8994 driver ASoC: Use DC servo startup mode when not doing DCS correction ASoC: Initial WM8958 audio configuration ASoC: Implement support for enhanced AIF3 on WM8958 ASoC: Add WM8958 Multi-band compressor support ASoC: Add WM8958 microphone detection support ASoC: Convert WM8994 to use soc-cache.c cache functions ASoC: Enable rbtree compression for WM8994/58 register cache ASoC: Implement runtime PM for WM8994/58 ASoC: Correct event flags for WM8958 AIF DACs ASoC: Allow user-specified WM8958 multiband compressor configurations ASoC: Provide WM8731 microphone boost TLV information ASoC: Split WM8731 enumeration array into individual enums ASoC: Automatically manage WM8731 deemphasis ASoC: Tune performance of WM8958 revision A ASoC: Apostrophe patrol in soc-core.c ASoC: Make the DAI ops constant in the DAI structure ASoC: Move active copy of CODEC read and write into runtime structure ASoC: Constify struct snd_soc_codec_driver ASoC: When disabling WM8994 FLL force a source selection ASoC: Add post-CODEC bias level callback for machine driver ASoC: Add trace events for jack detection ASoC: Support WM8994 mono AIF configurations ASoC: Implement WM8994/58 DAC and ADC oversampling control ASoC: Implement WM8903 high pass filter support ASoC: Implement WM8903 oversampling rate controls ASoC: Remove open coded symmetry implementation from WM8903 ASoC: Automatically manage WM8903 deemphasis rate ASoC: Fix widgets for WM8994/58 AIF2 source control ASoC: Fix AC'97 registration unwind regulator: Update LDO2 for WM8958 ASoC: Explicitly clear WM8993 ramp controls on power down ASoC: Remove unused DAPM_DOUBLE control types ASoC: Do DAPM control updates in the middle of DAPM sequences ASoC: Remove some unused defines from WM8903 ASoC: Fix WM8994/58 3D stereo control definitions ASoC: If we can't find a cache compression type default to flat ASoC: Make LZO cache compression optional ASoC: Use delayed work to debounce WM8350 jack IRQs ASoC: Trace Wolfson jack detection IRQs ASoC: Add jack IRQ trace to 88pm860x driver ASoC: ifdef out trace points from modules for x86 ASoC: Remove incorrect WM8903 erratum workaround ASoC: Remove WM8995 write sequencer bitfield definitions ASoC: Fix typo in x86 workaround ASoC: Fix double comment start ASoC: One more x86 typo fix ASoC: Yet more x86 tracepoint workarounds ASoC: Change Samsung Kconfig from ASOC_ to SND_SOC_

Maurus Cuelenaere (1): ASoC: Fix SmartQ compilation

Misael Lopez Cruz (2): ASoC: twl6040: Enable plug detection interrupts ASoC: twl6040: Use correct offset for LineInAmp Right

Nitin Daga (1): ALSA: hda: Disable 4/6 channels on some NVIDIA GPUs.

Olaya, Margarita (9): ASoC: dapm: Add output driver widget ASoC: twl6040: Update twl IO macro ASoC: twl6040: Modify the IRQ handler ASoC: twl6040: Restore bias level at resume ASoC: twl6040: Fix PCM error handling ops ASoC: twl6040: Support other sample rates. ASoC: twl6040: Enable automatic power for phoenix 1.1 ASoC: twl6040: Fix TLV dB step values for gains ASoC: twl6040: Set default gains to minimun value

Peter Ujfalusi (13): ASoC: TWL4030: Use usleep_range when appropriate ASoC: tlv320dac33: Do not enable the codec in init_chip ASoC: tlv320dac33: Avoid multiple soft power up ASoC: tpa6130a2: Simplify power state management ASoC: tpa6130a2: Defer SW enable from power enable ASoC: tpa6130a2: Use one event handler for PGA_E ASoC: tpa6130a2: Add stereo DAPM path ASoC: tpa6130a2: Replace DAPM code with direct interface ASoC: tlv320dac33: Rename outpup amplifier widget ASoC: tlv320dac33: Move DAC LR power on to a supply widget ASoC: tlv320dac33: Fix compillation error ASoC: tlv320dac33: Power down digital parts, when not needed ASoC: TWL4030: Fix 24bit support

Sascha Hauer (1): ASoC: i.MX: we can do mono

Seungwhan Youn (4): ASoC: SAMSUNG: Fix initial return value ASoC: SAMSUNG: Remove duplicated snd_card on smdk_spdif ASoC: Remove unnecessary structure definitions ASoC: SAMSUNG: Debug wrong parameter

Stephen Rothwell (1): ALSA: include delay.h for msleep in Xonar DG support

Takashi Iwai (14): ALSA: hda - Add a generic fixup callback for Realtek codecs ALSA: hda - Remove dead md2 quirk code ALSA: hda - Clean up cxt5066 port-D handling & co ALSA: hda - Enable beep for IDT92HD87 / 88 codecs ALSA: hda - Fix beep-tone on IDT 92HD87/88 codecs ALSA: hda - Mute speakers when line-out jack is plugged with Conexant auto mode ASoC: Fix merge errors with flush_scheduled_work() removal ALSA: hda - Clean up dead code in patch_realtek.c ASoC: don't pass the string as the format arguemtn for dev_info() ALSA: hda - Fix multi-headphone handling for Realtek codecs ALSA: hda - Add support for multiple headphone/speaker controls for Realtek ASoC: Fix section mismatch in wm8995.c ALSA: hda - Don't refer ELD when unplugged ALSA: hda - Add static_hdmi_pcm option to HDMI codec parser

Tejun Heo (1): sound: don't use flush_scheduled_work()

Todd Broch (2): ALSA: hda: Add modelname lookup and fixup for realtek codecs ALSA: hda: Add fixup for mario system

Uk Kim (1): ASoC: Add ADC high pass filter support to WM8994

Vasiliy Kulikov (1): ALSA: snd-atmel-abdac: test wrong variable

Vasily Khoruzhick (1): ASoC: Add HP iPAQ H1940 support

--- Documentation/sound/alsa/ALSA-Configuration.txt | 20 +- Documentation/sound/alsa/HD-Audio-Models.txt | 1 - MAINTAINERS | 45 +- arch/arm/mach-kirkwood/openrd-setup.c | 2 +- arch/arm/mach-s3c2410/mach-h1940.c | 2 +- arch/arm/mach-s3c2440/mach-rx1950.c | 2 +- arch/arm/mach-s3c64xx/clock.c | 2 +- arch/arm/mach-s3c64xx/dev-audio.c | 75 +- arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- arch/arm/mach-s5p6442/dev-audio.c | 44 +- arch/arm/mach-s5p64x0/clock-s5p6440.c | 2 +- arch/arm/mach-s5p64x0/clock-s5p6450.c | 2 +- arch/arm/mach-s5p64x0/dev-audio.c | 55 +- arch/arm/mach-s5pc100/dev-audio.c | 56 +- arch/arm/mach-s5pc100/mach-smdkc100.c | 2 + arch/arm/mach-s5pv210/clock.c | 10 +- arch/arm/mach-s5pv210/dev-audio.c | 58 +- arch/arm/mach-s5pv310/Kconfig | 1 + arch/arm/mach-s5pv310/Makefile | 3 +- arch/arm/mach-s5pv310/dev-audio.c | 364 ++ arch/arm/mach-s5pv310/dma.c | 168 + arch/arm/mach-s5pv310/include/mach/dma.h | 26 + arch/arm/mach-s5pv310/include/mach/irqs.h | 3 + arch/arm/mach-s5pv310/include/mach/map.h | 21 + arch/arm/mach-shmobile/board-ap4evb.c | 5 + arch/arm/plat-s3c24xx/devs.c | 19 +- arch/arm/plat-samsung/Makefile | 1 + arch/arm/plat-samsung/dev-asocdma.c | 25 + arch/arm/plat-samsung/include/plat/audio.h | 24 + arch/arm/plat-samsung/include/plat/devs.h | 11 +- arch/sh/boards/mach-se/7724/setup.c | 5 + drivers/gpio/wm8994-gpio.c | 24 + drivers/mfd/wm8994-core.c | 93 +- drivers/regulator/wm8994-regulator.c | 23 +- drivers/video/sh_mobile_hdmi.c | 1 + include/linux/mfd/wm8994/core.h | 8 + include/linux/mfd/wm8994/pdata.h | 17 + include/linux/mfd/wm8994/registers.h | 302 ++ include/sound/alc5623.h | 15 + include/sound/asound.h | 3 + include/sound/control.h | 4 +- include/sound/hdsp.h | 1 + include/sound/minors.h | 4 +- include/sound/pcm.h | 1 + include/sound/soc-dai.h | 4 +- include/sound/soc-dapm.h | 99 +- include/sound/soc.h | 116 +- include/trace/events/asoc.h | 235 ++ sound/ac97_bus.c | 4 +- sound/aoa/codecs/onyx.c | 1 - sound/aoa/core/gpio-feature.c | 7 +- sound/aoa/core/gpio-pmf.c | 7 +- sound/core/control.c | 28 +- sound/core/oss/pcm_oss.c | 4 +- sound/core/pcm_lib.c | 22 + sound/core/pcm_native.c | 3 + sound/core/seq/seq.c | 4 + sound/core/sound.c | 18 +- sound/core/timer.c | 7 +- sound/drivers/ml403-ac97cr.c | 4 +- sound/i2c/other/ak4113.c | 5 +- sound/i2c/other/ak4114.c | 5 +- sound/pci/Kconfig | 23 +- sound/pci/ac97/ac97_codec.c | 6 +- sound/pci/azt3328.c | 406 +- sound/pci/bt87x.c | 10 +- sound/pci/cmipci.c | 25 +- sound/pci/hda/hda_codec.c | 3 + sound/pci/hda/hda_intel.c | 9 +- sound/pci/hda/patch_analog.c | 72 +- sound/pci/hda/patch_conexant.c | 108 +- sound/pci/hda/patch_hdmi.c | 92 +- sound/pci/hda/patch_realtek.c | 669 ++-- sound/pci/hda/patch_sigmatel.c | 15 +- sound/pci/hda/patch_via.c | 3 +- sound/pci/ice1712/delta.c | 49 +- sound/pci/ice1712/delta.h | 11 + sound/pci/oxygen/Makefile | 4 +- sound/pci/oxygen/cs4245.h | 107 + sound/pci/oxygen/hifier.c | 239 -- sound/pci/oxygen/oxygen.c | 356 ++- sound/pci/oxygen/oxygen.h | 19 +- sound/pci/oxygen/oxygen_io.c | 4 +- sound/pci/oxygen/oxygen_lib.c | 71 +- sound/pci/oxygen/oxygen_mixer.c | 110 +- sound/pci/oxygen/oxygen_pcm.c | 55 +- sound/pci/oxygen/oxygen_regs.h | 16 +- sound/pci/oxygen/xonar.h | 2 + sound/pci/oxygen/xonar_cs43xx.c | 84 +- sound/pci/oxygen/xonar_dg.c | 572 +++ sound/pci/oxygen/xonar_dg.h | 8 + sound/pci/oxygen/xonar_hdmi.c | 2 +- sound/pci/oxygen/xonar_lib.c | 6 +- sound/pci/oxygen/xonar_pcm179x.c | 473 ++-- sound/pci/oxygen/xonar_wm87x6.c | 317 ++- sound/pci/rme9652/hdsp.c | 538 +++- sound/pci/ymfpci/ymfpci_main.c | 12 +- sound/soc/Kconfig | 17 +- sound/soc/Makefile | 2 +- sound/soc/atmel/playpaq_wm8510.c | 12 +- sound/soc/atmel/sam9g20_wm8731.c | 18 +- sound/soc/atmel/snd-soc-afeb9260.c | 14 +- sound/soc/au1x/db1200.c | 1 - sound/soc/blackfin/bf5xx-ad1836.c | 1 - sound/soc/blackfin/bf5xx-ad193x.c | 1 - sound/soc/blackfin/bf5xx-ad73311.c | 1 - sound/soc/blackfin/bf5xx-ssm2602.c | 1 - sound/soc/codecs/88pm860x-codec.c | 30 +- sound/soc/codecs/Kconfig | 17 + sound/soc/codecs/Makefile | 10 +- sound/soc/codecs/ad1836.c | 7 +- sound/soc/codecs/ad193x.c | 8 +- sound/soc/codecs/ad1980.c | 1 - sound/soc/codecs/ak4535.c | 20 +- sound/soc/codecs/ak4642.c | 2 +- sound/soc/codecs/ak4671.c | 11 +- sound/soc/codecs/alc5623.c | 1117 +++++ sound/soc/codecs/alc5623.h | 161 + sound/soc/codecs/cq93vc.c | 4 +- sound/soc/codecs/cs4270.c | 1 - sound/soc/codecs/cs42l51.c | 7 +- sound/soc/codecs/cx20442.c | 16 +- sound/soc/codecs/da7210.c | 2 +- sound/soc/codecs/jz4740.c | 11 +- sound/soc/codecs/max98088.c | 13 +- sound/soc/codecs/ssm2602.c | 10 +- sound/soc/codecs/stac9766.c | 2 +- sound/soc/codecs/tlv320aic23.c | 10 +- sound/soc/codecs/tlv320aic26.c | 5 +- sound/soc/codecs/tlv320aic3x.c | 71 +- sound/soc/codecs/tlv320dac33.c | 73 +- sound/soc/codecs/tpa6130a2.c | 100 +- sound/soc/codecs/tpa6130a2.h | 1 + sound/soc/codecs/twl4030.c | 56 +- sound/soc/codecs/twl6040.c | 855 ++++- sound/soc/codecs/twl6040.h | 8 + sound/soc/codecs/uda134x.c | 3 +- sound/soc/codecs/uda1380.c | 15 +- sound/soc/codecs/wl1273.c | 3 +- sound/soc/codecs/wm2000.c | 6 +- sound/soc/codecs/wm8350.c | 105 +- sound/soc/codecs/wm8400.c | 12 +- sound/soc/codecs/wm8510.c | 12 +- sound/soc/codecs/wm8523.c | 12 +- sound/soc/codecs/wm8580.c | 23 +- sound/soc/codecs/wm8711.c | 11 +- sound/soc/codecs/wm8728.c | 12 +- sound/soc/codecs/wm8731.c | 102 +- sound/soc/codecs/wm8737.c | 754 ++++ sound/soc/codecs/wm8737.h | 322 ++ sound/soc/codecs/wm8741.c | 10 +- sound/soc/codecs/wm8750.c | 13 +- sound/soc/codecs/wm8753.c | 49 +- sound/soc/codecs/wm8770.c | 749 ++++ sound/soc/codecs/wm8770.h | 51 + sound/soc/codecs/wm8776.c | 10 +- sound/soc/codecs/wm8804.c | 7 +- sound/soc/codecs/wm8900.c | 13 +- sound/soc/codecs/wm8903.c | 222 +- sound/soc/codecs/wm8903.h | 25 - sound/soc/codecs/wm8904.c | 36 +- sound/soc/codecs/wm8940.c | 8 +- sound/soc/codecs/wm8955.c | 12 +- sound/soc/codecs/wm8960.c | 29 +- sound/soc/codecs/wm8961.c | 13 +- sound/soc/codecs/wm8962.c | 41 +- sound/soc/codecs/wm8971.c | 30 +- sound/soc/codecs/wm8974.c | 13 +- sound/soc/codecs/wm8978.c | 13 +- sound/soc/codecs/wm8985.c | 12 +- sound/soc/codecs/wm8988.c | 11 +- sound/soc/codecs/wm8990.c | 12 +- sound/soc/codecs/wm8993.c | 21 +- sound/soc/codecs/wm8994-tables.c | 3147 +++++++++++++++ sound/soc/codecs/wm8994.c | 2544 ++++-------- sound/soc/codecs/wm8994.h | 14 + sound/soc/codecs/wm8995.c | 1818 +++++++++ sound/soc/codecs/wm8995.h | 4269 ++++++++++++++++++++ sound/soc/codecs/wm9081.c | 15 +- sound/soc/codecs/wm9090.c | 18 +- sound/soc/codecs/wm9705.c | 7 +- sound/soc/codecs/wm9712.c | 10 +- sound/soc/codecs/wm9713.c | 9 +- sound/soc/codecs/wm_hubs.c | 108 +- sound/soc/codecs/wm_hubs.h | 3 + sound/soc/davinci/davinci-evm.c | 23 +- sound/soc/davinci/davinci-sffsdr.c | 1 - sound/soc/ep93xx/ep93xx-i2s.c | 4 +- sound/soc/ep93xx/ep93xx-pcm.c | 4 +- sound/soc/ep93xx/snappercl15.c | 6 +- sound/soc/imx/eukrea-tlv320.c | 1 - sound/soc/imx/imx-ssi.c | 4 +- sound/soc/imx/phycore-ac97.c | 1 - sound/soc/imx/wm1133-ev1.c | 8 +- sound/soc/jz4740/jz4740-i2s.c | 1 - sound/soc/jz4740/qi_lb60.c | 14 +- sound/soc/kirkwood/Kconfig | 11 +- sound/soc/kirkwood/Makefile | 2 + sound/soc/kirkwood/kirkwood-openrd.c | 2 +- sound/soc/kirkwood/kirkwood-t5325.c | 141 + sound/soc/nuc900/nuc900-audio.c | 1 - sound/soc/omap/am3517evm.c | 14 +- sound/soc/omap/ams-delta.c | 82 +- sound/soc/omap/igep0020.c | 1 - sound/soc/omap/n810.c | 44 +- sound/soc/omap/omap2evm.c | 1 - sound/soc/omap/omap3beagle.c | 1 - sound/soc/omap/omap3evm.c | 1 - sound/soc/omap/omap3pandora.c | 45 +- sound/soc/omap/osk5912.c | 14 +- sound/soc/omap/overo.c | 1 - sound/soc/omap/rx51.c | 27 +- sound/soc/omap/sdp3430.c | 44 +- sound/soc/omap/sdp4430.c | 57 +- sound/soc/omap/zoom2.c | 36 +- sound/soc/pxa/corgi.c | 52 +- sound/soc/pxa/e740_wm9705.c | 30 +- sound/soc/pxa/e750_wm9705.c | 30 +- sound/soc/pxa/e800_wm9712.c | 8 +- sound/soc/pxa/em-x270.c | 1 - sound/soc/pxa/magician.c | 36 +- sound/soc/pxa/mioa701_wm9713.c | 18 +- sound/soc/pxa/palm27x.c | 34 +- sound/soc/pxa/poodle.c | 26 +- sound/soc/pxa/raumfeld.c | 1 - sound/soc/pxa/saarb.c | 18 +- sound/soc/pxa/spitz.c | 70 +- sound/soc/pxa/tavorevb3.c | 18 +- sound/soc/pxa/tosa.c | 38 +- sound/soc/pxa/z2.c | 16 +- sound/soc/pxa/zylonite.c | 12 +- sound/soc/s3c24xx/Kconfig | 171 - sound/soc/s3c24xx/Makefile | 55 - sound/soc/s3c24xx/aquila_wm8994.c | 295 -- sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 230 -- sound/soc/s3c24xx/s3c64xx-i2s.c | 242 -- sound/soc/s3c24xx/s3c64xx-i2s.h | 41 - sound/soc/s6000/s6105-ipcam.c | 42 +- sound/soc/samsung/Kconfig | 171 + sound/soc/samsung/Makefile | 55 + sound/soc/{s3c24xx/s3c-ac97.c => samsung/ac97.c} | 22 +- sound/soc/{s3c24xx/s3c-ac97.h => samsung/ac97.h} | 8 +- sound/soc/{s3c24xx/s3c-dma.c => samsung/dma.c} | 134 +- sound/soc/{s3c24xx/s3c-dma.h => samsung/dma.h} | 2 +- sound/soc/{s3c24xx => samsung}/goni_wm8994.c | 66 +- .../rx1950_uda1380.c => samsung/h1940_uda1380.c} | 249 +- sound/soc/samsung/i2s.c | 1258 ++++++ sound/soc/samsung/i2s.h | 29 + sound/soc/{s3c24xx => samsung}/jive_wm8750.c | 26 +- sound/soc/{s3c24xx => samsung}/lm4857.h | 0 sound/soc/{s3c24xx => samsung}/ln2440sbc_alc650.c | 9 +- .../{s3c24xx => samsung}/neo1973_gta02_wm8753.c | 72 +- sound/soc/{s3c24xx => samsung}/neo1973_wm8753.c | 130 +- sound/soc/{s3c24xx/s3c-pcm.c => samsung/pcm.c} | 6 +- sound/soc/{s3c24xx/s3c-pcm.h => samsung/pcm.h} | 2 +- sound/soc/{s3c24xx => samsung}/regs-i2s-v2.h | 0 sound/soc/{s3c24xx => samsung}/rx1950_uda1380.c | 16 +- sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.c | 4 +- sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.h | 2 +- sound/soc/{s3c24xx => samsung}/s3c2412-i2s.c | 4 +- sound/soc/{s3c24xx => samsung}/s3c2412-i2s.h | 2 +- sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.c | 2 +- sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.h | 0 sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.c | 5 +- sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.h | 2 +- .../{s3c24xx => samsung}/s3c24xx_simtec_hermes.c | 24 +- .../s3c24xx_simtec_tlv320aic23.c | 22 +- sound/soc/{s3c24xx => samsung}/s3c24xx_uda134x.c | 5 +- sound/soc/{s3c24xx => samsung}/smartq_wm8987.c | 64 +- sound/soc/{s3c24xx => samsung}/smdk2443_wm9710.c | 9 +- sound/soc/{s3c24xx => samsung}/smdk_spdif.c | 21 +- .../smdk64xx_wm8580.c => samsung/smdk_wm8580.c} | 174 +- sound/soc/samsung/smdk_wm8994.c | 176 + sound/soc/{s3c24xx => samsung}/smdk_wm9713.c | 26 +- sound/soc/{s3c24xx => samsung}/spdif.c | 4 +- sound/soc/{s3c24xx => samsung}/spdif.h | 2 +- sound/soc/sh/Kconfig | 4 +- sound/soc/sh/fsi-ak4642.c | 140 +- sound/soc/sh/fsi-da7210.c | 2 +- sound/soc/sh/fsi.c | 273 +- sound/soc/sh/migor.c | 6 +- sound/soc/sh/sh7760-ac97.c | 3 +- sound/soc/sh/siu.h | 2 +- sound/soc/sh/siu_dai.c | 2 +- sound/soc/sh/siu_pcm.c | 2 +- sound/soc/soc-cache.c | 1065 +++++- sound/soc/soc-core.c | 575 ++- sound/soc/soc-dapm.c | 860 +++-- sound/soc/soc-jack.c | 31 +- sound/usb/format.c | 5 +- sound/usb/midi.c | 19 +- sound/usb/mixer.c | 11 +- sound/usb/quirks-table.h | 4 +- sound/usb/usx2y/us122l.c | 41 +- 294 files changed, 24957 insertions(+), 7039 deletions(-) create mode 100644 arch/arm/mach-s5pv310/dev-audio.c create mode 100644 arch/arm/mach-s5pv310/dma.c create mode 100644 arch/arm/mach-s5pv310/include/mach/dma.h create mode 100644 arch/arm/plat-samsung/dev-asocdma.c create mode 100644 include/sound/alc5623.h create mode 100644 include/trace/events/asoc.h create mode 100644 sound/pci/oxygen/cs4245.h delete mode 100644 sound/pci/oxygen/hifier.c create mode 100644 sound/pci/oxygen/xonar_dg.c create mode 100644 sound/pci/oxygen/xonar_dg.h create mode 100644 sound/soc/codecs/alc5623.c create mode 100644 sound/soc/codecs/alc5623.h create mode 100644 sound/soc/codecs/wm8737.c create mode 100644 sound/soc/codecs/wm8737.h create mode 100644 sound/soc/codecs/wm8770.c create mode 100644 sound/soc/codecs/wm8770.h create mode 100644 sound/soc/codecs/wm8994-tables.c create mode 100644 sound/soc/codecs/wm8995.c create mode 100644 sound/soc/codecs/wm8995.h create mode 100644 sound/soc/kirkwood/kirkwood-t5325.c delete mode 100644 sound/soc/s3c24xx/Kconfig delete mode 100644 sound/soc/s3c24xx/Makefile delete mode 100644 sound/soc/s3c24xx/aquila_wm8994.c delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s-v4.c delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.c delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.h create mode 100644 sound/soc/samsung/Kconfig create mode 100644 sound/soc/samsung/Makefile rename sound/soc/{s3c24xx/s3c-ac97.c => samsung/ac97.c} (96%) rename sound/soc/{s3c24xx/s3c-ac97.h => samsung/ac97.h} (73%) rename sound/soc/{s3c24xx/s3c-dma.c => samsung/dma.c} (74%) rename sound/soc/{s3c24xx/s3c-dma.h => samsung/dma.h} (97%) rename sound/soc/{s3c24xx => samsung}/goni_wm8994.c (84%) copy sound/soc/{s3c24xx/rx1950_uda1380.c => samsung/h1940_uda1380.c} (56%) create mode 100644 sound/soc/samsung/i2s.c create mode 100644 sound/soc/samsung/i2s.h rename sound/soc/{s3c24xx => samsung}/jive_wm8750.c (88%) rename sound/soc/{s3c24xx => samsung}/lm4857.h (100%) rename sound/soc/{s3c24xx => samsung}/ln2440sbc_alc650.c (92%) rename sound/soc/{s3c24xx => samsung}/neo1973_gta02_wm8753.c (88%) rename sound/soc/{s3c24xx => samsung}/neo1973_wm8753.c (83%) rename sound/soc/{s3c24xx/s3c-pcm.c => samsung/pcm.c} (99%) rename sound/soc/{s3c24xx/s3c-pcm.h => samsung/pcm.h} (99%) rename sound/soc/{s3c24xx => samsung}/regs-i2s-v2.h (100%) rename sound/soc/{s3c24xx => samsung}/rx1950_uda1380.c (95%) rename sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.c (99%) rename sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.h (98%) rename sound/soc/{s3c24xx => samsung}/s3c2412-i2s.c (98%) rename sound/soc/{s3c24xx => samsung}/s3c2412-i2s.h (95%) rename sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.c (99%) rename sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.h (100%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.c (99%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.h (94%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec_hermes.c (87%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec_tlv320aic23.c (86%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_uda134x.c (99%) rename sound/soc/{s3c24xx => samsung}/smartq_wm8987.c (82%) rename sound/soc/{s3c24xx => samsung}/smdk2443_wm9710.c (92%) rename sound/soc/{s3c24xx => samsung}/smdk_spdif.c (95%) rename sound/soc/{s3c24xx/smdk64xx_wm8580.c => samsung/smdk_wm8580.c} (55%) create mode 100644 sound/soc/samsung/smdk_wm8994.c rename sound/soc/{s3c24xx => samsung}/smdk_wm9713.c (87%) rename sound/soc/{s3c24xx => samsung}/spdif.c (99%) rename sound/soc/{s3c24xx => samsung}/spdif.h (94%)