From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752313Ab2JHMaE (ORCPT ); Mon, 8 Oct 2012 08:30:04 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53417 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751455Ab2JHMaA (ORCPT ); Mon, 8 Oct 2012 08:30:00 -0400 Date: Mon, 08 Oct 2012 14:29:57 +0200 Message-ID: From: Takashi Iwai To: Linus Torvalds Cc: Mark Brown , Liam Girdwood , linux-kernel@vger.kernel.org Subject: [GIT PULL] sound updates for 3.7-rc1 User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.1 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linus, please pull sound updates for v3.7-rc1 from: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.7 Sorry for a bit late pull request, as I've been on vacation without laptop for the last weeks. Hopefully we catch up all pending issues in time. This pull will give you handful merge conflicts in arch/arm and sound/soc. Since most of them are trivial conflicts, I let you Merge Meister to resolve them. Note that the diffstat below is the result after merge resolves. Thanks! Takashi ---------------------------------------------------------------- Sound updates for 3.7-rc1 This contains pretty many small commits covering fairly large range of files in sound/ directory. Partly because of additional API support and partly because of constantly developed ASoC and ARM stuff. Some highlights: - Introduced the helper function and documentation for exposing the channel map via control API, as discussed in Plumbers; most of PCI drivers are covered, will follow more drivers later - Most of drivers have been replaced with the new PM callbacks (if the bus is supported) - HD-audio controller got the support of runtime PM and the support of D3 clock-stop. Also changing the power_save option in sysfs kicks off immediately to enable / disable the power-save mode. - Another significant code change in HD-audio is the rewrite of firmware loading code. Other than that, most of changes in HD-audio are continued cleanups and standardization for the generic auto parser and bug fixes (HBR, device-specific fixups), in addition to the support of channel-map API. - Addition of ASoC bindings for the compressed API, used by the mid-x86 drivers. - Lots of cleanups and API refreshes for ASoC codec drivers and DaVinci. - Conversion of OMAP to dmaengine. - New machine driver for Wolfson Microelectronics Bells. - New CODEC driver for Wolfson Microelectronics WM0010. - Enhancements to the ux500 and wm2000 drivers - A new driver for DA9055 and the support for regulator bypass mode. ---------------------------------------------------------------- Alexander Shiyan (1): ASoC: Rename ep93xx soc directory to cirrus Andi Kleen (1): ALSA: lto, sound: Fix export symbols for !CONFIG_MODULES Andy Shevchenko (1): ALSA: print small buffers via %*ph[C] Ashish Chavan (1): ASoC: codecs: Add DA9055 codec driver Bo Shen (1): ASoC: wm8904: remove redundant code Charles Keepax (1): ASoC: wm5110: Adding missing volume update bits Chris Rattray (1): ASoC: wm8994: enable mic and short detect debounce. Dan Carpenter (2): ASoC: wm0010: unlock on error path ALSA: compress_core: integer overflow in snd_compr_allocate_buffer() Daniel Mack (4): ASoC: add DT bindings for cs4270 ASoC: Add reset-gpio DT property to cs4270 driver ALSA: snd-usb: Add quirks for Playback Designs devices ALSA: ASoC: add DT bindings for CS4271 David Flater (1): ALSA: emu8000: fix emu8000 DRAM sized 512 KiB too small David Henningsson (10): ALSA: hda - fix control names for multiple speaker out on IDT/STAC ALSA: hda - Remove ignore_misc_bit ALSA: hda - limit internal mic boost for Asus X202E ALSA: hda - avoid non-standard "Docking" name in mixers ALSA: usb - disable broken hw volume for Tenx TP6911 ALSA: hda - use both input paths on Conexant auto parser ALSA: hda - make a generic unsol event handler ALSA: hda - make Realtek/Sigmatel/Conexant use the generic unsol event ALSA: hda - fix indices on boost volume on Conexant ALSA: hda - avoid unneccesary indices on "Headphone Jack" controls Dimitris Papastamos (1): ASoC: wm0010: Add initial wm0010 DSP driver Dylan Reid (4): ALSA: usb-audio: set period_bytes in substream. ALSA: usb-audio: Don't require hw_params in endpoint. ALSA: usb-audio: Move configuration to prepare. ALSA: hda - Fix hang caused by race during suspend. Emil Goode (1): ASoC: wm0010: Fix warning, use format %zu for type size_t Eric Millbrandt (6): ASoC: fsl: mpc5200 combine psc_dma platform data ASoC: fsl: mpc5200 add missing information to snd_soc_dai_driver ASoC: fsl: cleanup headers in pcm030-audio-fabric ASoC: fsl: add PPC_MPC52xx dependency to SND_POWERPC_SOC ASoC: fsl: pcm030-audio-fabric use snd_soc_register_card ASoC: fsl: register the wm9712-codec Fabio Estevam (7): ASoC: imx-ssi: Use devm functions ASoC: mxs-saif: Use devm_clk_get() ASoC: Revert "ASoC: mc13783: Provide codec->control_data" ASoC: Revert "ASoC: ab8500: Inform SoC Core that we have our own I/O arrangements" Revert "ASoC: AC97 doesn't use regmap by default" ASoC: cs4270: Remove mono support ASoC: eukrea-tlv320: Convert it to platform driver Felix Kaechele (1): ALSA: hda - Add inverted internal mic quirk for Lenovo IdeaPad U310 Fengguang Wu (1): ASoC: wm0010: Add missing IRQF_ONESHOT Gaëtan Carlier (1): ASoC: imx-mc13783: use defines instead of numerical address of register Hebbar, Gururaja (9): ASoC: Davinci: McASP: remove unused header include ASoC: McASP: Convert driver to use Runtime PM API ASoC: tlv320aic3x: Add device tree bindings ASoC: davinci: davinci-pcm does not need to be a plaform_driver ARM: Davinci: Remove references to davinci pcm ASoC/ARM: Davinci: McASP: split asp header into platform and audio specific ASoC: Davinci: McASP: add device tree support for McASP ASoC: Davinci: evm: Fix typo in cpu dai name ASoC: Davinci: McASP: add support new McASP IP Variant Herton Ronaldo Krzesinski (2): ALSA: hda/via - don't report presence on HPs with no presence support ALSA: hda/realtek - Fix detection of ALC271X codec Jaroslav Kysela (1): ALSA: remove the main version information Javier Martin (1): ASoC: Revert 'ASoC: imx-ssi: Remove mono support' Jerry Snitselaar (1): ASoC: core: remove unused variable in soc_probe() in linux-next Josh Triplett (1): ALSA: Remove the last mention of SNDRV_MAIN_OBJECT_FILE Kailang Yang (1): ALSA: hda - Add new codec ALC283 ALC290 support Kuninori Morimoto (3): ASoC: fsi: fixup pm_runtime_disable() timing on fsi_probe() ASoC: fsi: tidyup: remove un-necessary operation from fsi_probe() ASoC: fsi: convert to devm_xxx() Lars-Peter Clausen (4): ASoC: Remove unused 'saved_value' field from snd_soc_dapm_widget struct ASoC: ad193x: Use managed regmap init ASoC: ad1836: Convert to direct regmap usage. ASoC: Avoid recalculating the bitmask for SOC_ENUM controls Lee Jones (1): ASoC: ux500: Strengthen error checking after memory allocation Mark Brown (85): ASoC: wm8994: Implement support for self-oscillation mode in the FLL ASoC: jack: Always update jack state even for noop changes ASoC: wm_hubs: Move CODEC stored in private data into wm_hubs ASoC: wm8994: Ensure we get a notification on startup for jackdet ASoC: wm_hubs: Factor out DC servo readback code ASoC: wm_hubs: Rename calibrate_dc_servo() ASoC: wm8994: Fix some indentation issues ASoC: ab8500: Remove pointless cast ASoC: wm9712: Fix funky indentation ASoC: wm9712: Fix name of Capture Switch ASoC: sta529: Staticise non-exported codec driver struct ASoC: imx-ssi: Say if we fail to register a second AC'97 bus ASoC: core: Remove pointless error on card registration failure ASoC: arizona: Implement OPCLK support ASoC: wm5102: Enable output clocks ASoC: wm5110: Enable output clocks ASoC: bells: Add machine driver for Wolfson Bells boards ASoC: wm5102: Add AEC routing control ASoC: wm8994: Add bytes controls for DRC ASoC: wm9712: Provide TLV information for capture boost controls ASoC: wm_hubs: Use explicit casts for converting to signed ASoC: wm_hubs: Add trace showing semantics of the DCS update ASoC: wm_hubs: Allow configuration of MICBIAS power up delay via pdata ASoC: wm8994: Update for new WM1811 variants ASoC: wm0010: Fix passthrough routing ASoC: samsung: Add hookup of WM0010 on Speyside ASoC: wm0010: Enable 44.1kHz support ASoC: wm0010: Add dummy widget for CLKIN ASoC: wm0010: Set idle_bias_off ASoC: wm0010: Don't double free reset GPIO ASoC: wm0010: Tweak diagnostic output ASoC: wm0010: Move resource acquisition to device probe ASoC: dapm: Ensure bypass paths are suspended and resumed ASoC: dapm: Add flags to regulator supplies ASoC: wm8983: Convert to devm_kzalloc() ASoC: wm8983: Convert to direct regmap API usage ASoC: wm8523: Convert to devm_kzalloc() ASoC: wm8523: Move regulator acquisition to I2C probe() ASoC: wm8523: Convert to direct regmap API usage ASoC: wm8523: Move device ID verification and reset to I2C probe ASoC: sta32x: Move regulator acquisition to I2C probe ASoC: sta32x: Convert to regmap ASoC: wm8741: Move regulator acquisition to I2C/SPI probe() ASoC: wm8741: Convert to direct regmap API usage ASoC: wm8960: Convert to direct regmap API usage ASoC: cs4270: Conver to data based control init ASoC: cs4270: Move regulator acquisition to I2C probe() ASoC: cs4270: Convert to direct regmap API usage ASoC: wm8900: Convert to devm_kzalloc() ASoC: wm8900: Convert to direct regmap API usage ASoC: wm8900: Fix typo of name to wm9700 ASoC: wm8510: Convert to devm_kzalloc() ASoC: wm8580: Convert to devm_kzalloc() ASoC: wm8711: Convert to devm_kzalloc() ASoC: wm8728: Convert to devm_kzalloc() ASoC: wm8737: Convert to devm_kzalloc() ASoC: wm8990: Convert to devm_kzalloc() ASoC: wm8991: Convert to devm_kzalloc() ASoC: wm8510: Convert to direct regmap API usage ASoC: wm8580: Convert to direct regmap API usage ASoC: wm8580: Move regulator acquisition to I2C probe ASoC: wm8711: Convert to direct regmap API usage ASoC: wm8728: Convert to direct regmap API usage ASoC: wm8737: Move regulator acquisition to device registration ASoC: wm8737: Convert to direct regmap API usage ASoC: arizona: Clarify logging for FLL lock status interrupt ASoC: core: Mark regmap CODEC register maps as dirty when suspending ASoC: wm8776: Convert to direct regmap API usage ASoC: wm8960: Support shared LRCLK ASoC: wm8961: Convert to direct regmap API usage ASoC: wm8961: Move device identification and reset to I2C probe ASoC: wm2000: Convert to devm_regmap_init_i2c() ASoC: wm2000: Add regulator support ASoC: dapm: Allow regulators to bypass as well as disable when idle ASoC: wm5102: Enable bypass mode for MICVDD ASoC: wm5110: Enable bypass mode for MICVDD ASoC: wm0010: Allow slow GPIO for reset ASoC: wm0010: Don't check if reset GPIO is defined when removing ASoC: wm0010: Initialise chip state before we register the interrupt ASoC: arizona: Add more DSP options for mixer input muxes ASoC: arizona: Add more clock rates ASoC: wm5110: Rename EPOUT to HPOUT3 ASoC: wm5110: Add AEC loopback support ASoC: wm5110: Add OUT3R support ASoC: wm_hubs: Ensure volume updates are handled during class W startup Marko Friedemann (1): ALSA: USB: Support for (original) Xbox Communicator Markus Bollinger (1): ALSA: pcxhr: Add 8 new sound cards Mengdong Lin (2): ALSA: hda - add runtime PM support ALSA: hda - bug fix on references without checking CONFIG_SND_HDA_POWER_SAVE Namarta Kohli (1): ASoC: add compress stream support Oleksij Rempel (1): ALSA: hda - Add external mic quirk for Asus Zenbook UX31A Omair Mohammed Abdullah (1): ALSA: aloop - add locking to timer access Ondrej Zary (4): ALSA: isa: Move snd_legacy_find_free_ioport to initval.h ALSA: snd-ad1816a: remove useless struct snd_card_ad1816a ALSA: snd-ad1816a: Implement suspend/resume ALSA: introduce snd-cmi8328: C-Media CMI8328 driver Peter Senna Tschudin (2): ASoC: core: Remove useless kfree sound: Remove unnecessary semicolon Peter Ujfalusi (56): ASoC: omap-mcpdm: Convert to use devm_* ASoC: omap-abe-twl6040: Add device tree support ASoC: core: Set dapm->idle_bias_off for DAIs not mapped with a codec ASoC: omap-twl4030: Simple machine driver for TI SoC with twl4030 codec ARM: OMAP: twl-common: Add helper function to register the omap-twl4030 audio driver ARM: OMAP3: Switch to use the unified audio driver (omap-twl4030) for selected boards ASoC: Remove obsolete OMAP3 machine drivers ARM/ASoC: omap-mcbsp: Move OMAP2+ clock parenting code to ASoC driver ARM: OMAP: mcbsp: Enable FIFO use for OMAP2430 ARM: OMAP: board-am3517evm: Configure McBSP1 CLKR/FSR signal source ASoC: am3517evm: Do not configure McBSP1 CLKR/FSR signal muxing ARM/ASoC: omap-mcbsp: Remove CLKR/FSR mux configuration code ASoC: omap-mcbsp: Remove unused defines ASoC: omap-mcbsp: Remove cpu_is_omap* checks from the code ARM: OMAP2+: McBSP: Do not create legacy devices when booting with DT data ASoC: omap-mcbsp: Add device tree bindings ASoC: omap-mcbsp: Device tree binding documentation update ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled ASoC: omap-mcbsp: Check mcbsp->id instead of cpu_dai->id when adding ST controls ASoC: omap-mcbsp: Only print warning if the st_data is missing for the port ASoC: omap-mcbsp: Use macro to create the McBSP2/3 ST controls ASoC: omap-mcbsp: Single macro for st channel volume set/get ASoC: omap-mcbsp: Fix compilation error due to leftover code ASoC: am3517evm: Remove unused cpu_dai from hw_params ASoC: twl4030: Convert to use DAI DAPM widgets ASoC: twl6040: Convert to use DAI DAPM widgets dmaengine: omap: Support for element mode in cyclic DMA dmaengine: omap: Add support for pause/resume in cyclic dma mode dmaengine: Pass flags via device_prep_dma_cyclic() callback dmaengine: omap-dma: Add support to suppress interrupts in cyclic mode ASoC: omap-mcbsp: Use sDMA packet mode instead of frame mode ASoC: omap-pcm: Select sDMA synchronization based on packet_size ASoC: OMAP: Remove sync_mode from omap_pcm_dma_data struct ASoC: omap-pcm: Prepare to configure the DMA data_type based on stream properties ARM: OMAP4: hwmod_data: Add resource names to McPDM memory ranges ASoC: omap-mcpdm: Use platform_get_resource_* to get resources ASoC: OMAP: mcbsp, mcpdm, dmic: Let omap-pcm to pick the dma_type ASoC: omap-pcm, omap-dmic: Change the use of omap_pcm_dma_data->data_type ASoC: OMAP: mcbsp, mcpdm, dmic, hdmi: Set dma_data at startup time ASoC: omap-pcm: Convert to use dmaengine mfd: twl4030-audio: Clean up MODULE_* and platform_driver part mfd: twl4030-audio: Convert to use devm_kzalloc mfd: twl4030-audio: Rearange and clean-up the probe function mfd: twl-core: Add API to query the HFCLK rate mfd: twl4030-audio: Get audio MCLK via twl-core API instead of pdata dt: Add empty of_find_node_by_name() function mfd: twl4030-audio: Add DT support Input: twl4030-vibra: Support for DT booted kernel ASoC: twl4030: Move hs_extmute GPIO handling to driver ARM: OMAP/ASoC: Zoom2: Let the codec to handle the hs_extmute GPIO ASoC/mfd: twl4030: Remove set_hs_extmute callback from platform data ASoC: twl4030: Convert to use devm_kzalloc ASoC: twl4030: Add pointer to pdata within the private data ASoC: twl4030: Support for DT booted kernel dmaengine: Add flags parameter to dmaengine_prep_dma_cyclic() ARM: SAMSUNG: dma-ops: Fix dmaengine_prep_dma_cyclic() parameter list Pierre-Louis Bossart (3): ALSA: hda - force use of SSYNC bits ALSA: hda - use LPIB for delay estimation ALSA: hda - add PCI identifier for Intel 5 Series/3400 Richard Zhao (3): ASoC: imx-pcm-dma: check kzalloc return value in function snd_imx_open ASoC: imx-pcm-dma: open function failed when snd_dmaengine_pcm_open fail ASoC: imx-audmux: remove null check of audmux_base in audmux_read_file Sachin Kamat (33): ASoC: isabelle: Remove version.h header file inclusion ASoC: tlv320aic32x4: Use module_i2c_driver ASoC: max9877: Use module_i2c_driver ASoC: wm9090: Use module_i2c_driver ASoC: wm8991: Use module_i2c_driver ASoC: cs4270: Use module_i2c_driver ASoC: tlv320aic3x: Use module_i2c_driver ASoC: sta32x: Use module_i2c_driver ASoC: tlv320dac33: Use module_i2c_driver ASoC: adau1701: Use module_i2c_driver ASoC: max9850: Use module_i2c_driver ASoC: wm8971: Use module_i2c_driver ASoC: ak4671: Use module_i2c_driver ASoC: lm4857: Use module_i2c_driver ASoC: wm8978: Use module_i2c_driver ASoC: max98088: Use module_i2c_driver ASoC: wm8955: Use module_i2c_driver ASoC: wm2200: Use module_i2c_driver ASoC: wm2000: Use module_i2c_driver ASoC: wm8940: Use module_i2c_driver ASoC: wm8961: Use module_i2c_driver ASoC: wm8903: Use module_i2c_driver ASoC: adau1373: Use module_i2c_driver ASoC: wm8960: Use module_i2c_driver ASoC: wm8974: Use module_i2c_driver ASoC: max98095: Use module_i2c_driver ASoC: cs42l51: Use module_i2c_driver ASoC: tpa6130a2: Use module_i2c_driver ASoC: cs42l52: Remove duplicate inclusion of slab.h header file ASoC: soc-compress: Remove unused variable ASoC: tlv320aic26: Use module_spi_driver ASoC: wm8770: Use module_spi_driver ASoC: ad1836: Use module_spi_driver Sangsu Park (1): ASoC: SAMSUNG: Change Kconfig to support all SAMSUNG ASoC Scott Jiang (2): ASoC: bf5xx-ad1836: convert to use snd_soc_register_card blackfin: add platform device for ad1836 machine driver Shawn Guo (1): ASoC: mx27vis: retrieve gpio numbers from platform_data Stephen Warren (1): ASoC: tegra: move platform data header Takashi Iwai (54): ALSA: hda - Load firmware in hda_intel.c ALSA: hda - Deferred probing with request_firmware_nowait() ALSA: hda - Fix forgotten ifdef CONFIG_SND_HDA_PATCH_LOADER ALSA: hda - Fix possible compile warnings regarding CONFIG_PM ALSA: PCI: Replace CONFIG_PM with CONFIG_PM_SLEEP ALSA: hda - Add 3stack-automute model to AD1882 codec ALSA: hda - Add tracepoints at snd_hda_power_up/down entrances. ALSA: hda - Implement snd_hda_power_sync() helper function ALSA: hda - Check the power state when power_save option is changed ALSA: hda - Add missing ifdef CONFIG_SND_HDA_POWER_SAVE to tracepoints ALSA: hda - Call snd_hda_jack_report_sync() generically in hda_codec.c ALSA: cmi8328: Fix build error with CONFIG_GAMEPORT=n ALSA: hda - Make clear built-in driver optimization ALSA: usb-audio: Remove obsoleted fields in struct snd_usb_substream ALSA: hda - Fix runtime PM leftover refcounts ALSA: hda - Fix D3 clock stop check for codecs with own set_power_state op ALSA: hda - Clean up CONFIG_SND_HDA_POWER_SAVE ALSA: hda - Optimize bitfield usage in struct hda_codec ALSA: korg1212: Fix reverted min/max ADC sense range ALSA: cs5530: Fix resource leak in error path ALSA: hda - Yet another fix for D3 stop-clock refcounting ALSA: hda - Clean up redundant FG checks ALSA: hda - Move non-PCM check to per_pin in patch_hdmi.c ALSA: PCM: channel mapping API implementation ALSA: control: Fix missing VOLATILE flag at creating controls ALSA: Add a documentation for channel mapping API ALSA: hda - Add standard channel maps ALSA: hda - Provide the proper channel mapping for generic HDMI driver ALSA: hda - Fix channel maps for Nvidia 7x 8ch HDMI codecs ALSA: ac97: Implement channel map workaround for ALC650 ALSA: Implement channel maps for standard onboard AC97 drivers ALSA: cmipci: Implement channel mapping ALSA: ctxfi: Implement channel maps ALSA: Remove VOLATILE flag from chmap ctls ALSA: Follow channel position definitions to alsa-lib mixer ALSA: hda - Allow 3/5/7 channel map for HDMI/DP ALSA: pcm - Use UNKNOWN chmap for mono streams ALSA: hda - Avoid BDL position workaround when no_period_wakeup is set ALSA: hda - Check bit mask for codec SSID in snd_hda_pick_fixup() ALSA: hda - Replace with the generic fixup codes in patch_cirrus.c ALSA: hda - Add support for MacBook Pro 10,1 ALSA: ctxfi: Fix mono channel map to UNKNOWN ALSA: ens1370: Reduce ifdefs ALSA: ca0106: Define channel maps ALSA: emu10k1x: Define channel maps ALSA: ens1370: Define channel maps ALSA: ymfpci: Define channel maps ALSA: Define more channel map positions ALSA: hda - Fix disordered enum definitions in patch_cirrus.c ALSA: Fix leftover chmap UNKNOWN -> MONO conversions ALSA: hda - Allow to pass position_fix=0 explicitly ALSA: hda - Add mic-mute LED control for HP laptop ALSA: usb-audio: Avoid unnecessary EP setups in prepare ALSA: Make snd_sgbuf_get_{ptr|addr}() available for non-SG cases Timur Tabi (4): ASoC: fsl: use snd_soc_register_card to register the card ASoC: fsl: remove unnecessary call to dma_unmap_single ASoC: wm8960: add support for big-endian audio samples ASoC: wm8960: remove 'dres' field from platform data structure Vinod Koul (5): ASoC: add definations for compressed operations ASoC: mid-x86 - add support for compressed streams ASoC: compress - fix code alignment ALSA: compress - move the buffer check ALSA: Compress - add codec parameter checks Wang Xingchao (5): ALSA: hda - show ICT/KAE control bits ALSA: HDMI - Fix channel_allocation array wrong order ALSA: HDMI - Enable HBR feature on Intel chips ALSA: HDMI - Setup channel mapping for non_pcm audio ALSA: hda - Add another pci id for Haswell board Wei Yongjun (3): ALSA: fix possible memory leak in snd_mixer_oss_build_input() ALSA: opl4: use list_move_tail instead of list_del/list_add_tail ALSA: emu10k1: use list_move_tail instead of list_del/list_add_tail --- Documentation/devicetree/bindings/sound/cs4270.txt | 21 + Documentation/devicetree/bindings/sound/cs4271.txt | 36 + .../bindings/sound/davinci-mcasp-audio.txt | 45 + .../devicetree/bindings/sound/omap-abe-twl6040.txt | 91 ++ .../devicetree/bindings/sound/omap-mcbsp.txt | 37 + .../devicetree/bindings/sound/omap-twl4030.txt | 17 + .../devicetree/bindings/sound/tlv320aic3x.txt | 20 + Documentation/sound/alsa/ALSA-Configuration.txt | 10 +- Documentation/sound/alsa/Channel-Mapping-API.txt | 153 ++ Documentation/sound/alsa/HD-Audio-Models.txt | 3 +- arch/arm/mach-davinci/asp.h | 49 + arch/arm/mach-davinci/davinci.h | 3 +- arch/arm/mach-davinci/devices-da8xx.c | 8 +- arch/arm/mach-davinci/devices.c | 11 - arch/arm/mach-davinci/dm355.c | 2 +- arch/arm/mach-davinci/dm365.c | 2 +- arch/arm/mach-davinci/dm644x.c | 2 +- arch/arm/mach-davinci/dm646x.c | 2 +- arch/arm/mach-davinci/include/mach/da8xx.h | 2 +- arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 1 + arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 1 + arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 1 + arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c | 1 + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 42 +- arch/arm/mach-omap2/board-am3517evm.c | 13 + arch/arm/mach-omap2/board-cm-t35.c | 1 + arch/arm/mach-omap2/board-devkit8000.c | 1 + arch/arm/mach-omap2/board-igep0020.c | 1 + arch/arm/mach-omap2/board-omap3beagle.c | 1 + arch/arm/mach-omap2/board-omap3evm.c | 1 + arch/arm/mach-omap2/board-overo.c | 1 + arch/arm/mach-omap2/board-zoom-peripherals.c | 9 +- arch/arm/mach-omap2/include/mach/board-zoom.h | 2 - arch/arm/mach-omap2/mcbsp.c | 126 +- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 + arch/arm/mach-omap2/twl-common.c | 27 + arch/arm/mach-omap2/twl-common.h | 2 + arch/arm/plat-samsung/dma-ops.c | 3 +- arch/blackfin/mach-bf527/boards/ezkit.c | 20 + arch/blackfin/mach-bf533/boards/stamp.c | 20 + arch/blackfin/mach-bf537/boards/stamp.c | 20 + arch/blackfin/mach-bf561/boards/ezkit.c | 20 + arch/blackfin/mach-bf609/boards/ezkit.c | 19 + drivers/dma/at_hdmac.c | 3 +- drivers/dma/ep93xx_dma.c | 4 +- drivers/dma/imx-dma.c | 2 +- drivers/dma/imx-sdma.c | 2 +- drivers/dma/mmp_tdma.c | 2 +- drivers/dma/mxs-dma.c | 2 +- drivers/dma/omap-dma.c | 45 +- drivers/dma/pl330.c | 2 +- drivers/dma/sa11x0-dma.c | 2 +- drivers/dma/sirf-dma.c | 2 +- drivers/dma/ste_dma40.c | 3 +- drivers/dma/tegra20-apb-dma.c | 2 +- include/linux/dmaengine.h | 7 +- include/linux/i2c/twl.h | 2 +- include/linux/mfd/wm8994/pdata.h | 4 + include/linux/platform_data/asoc-mx27vis.h | 11 + include/linux/platform_data/asoc-ti-mcbsp.h | 2 - .../linux/platform_data/davinci_asp.h | 74 +- include/linux/platform_data/omap-twl4030.h | 32 + include/sound/ac97_codec.h | 3 + include/sound/ad1816a.h | 9 +- include/sound/asound.h | 39 + include/sound/compress_driver.h | 1 + include/sound/compress_params.h | 1 + include/sound/da9055.h | 33 + include/sound/emu10k1.h | 4 +- include/sound/initval.h | 14 + include/sound/memalloc.h | 27 +- include/sound/pcm.h | 87 +- include/sound/soc-dai.h | 3 + include/sound/soc-dapm.h | 10 +- include/sound/soc.h | 20 +- .../sound/tegra_wm8903.h | 7 +- include/sound/tlv.h | 8 + include/sound/version.h | 3 - include/sound/wm0010.h | 27 + include/sound/wm8960.h | 2 +- include/sound/wm8993.h | 4 + sound/core/compress_offload.c | 26 + sound/core/control.c | 1 + sound/core/info.c | 7 +- sound/core/info_oss.c | 3 +- sound/core/oss/mixer_oss.c | 2 + sound/core/pcm.c | 4 + sound/core/pcm_lib.c | 214 +++ sound/core/pcm_memory.c | 26 - sound/core/seq/seq_device.c | 2 + sound/core/sgbuf.c | 27 + sound/core/sound.c | 3 +- sound/drivers/aloop.c | 6 + sound/drivers/opl3/opl3_midi.c | 2 +- sound/drivers/opl4/opl4_synth.c | 9 +- sound/drivers/vx/vx_pcm.c | 2 +- sound/isa/Kconfig | 12 + sound/isa/Makefile | 2 + sound/isa/ad1816a/ad1816a.c | 64 +- sound/isa/ad1816a/ad1816a_lib.c | 38 +- sound/isa/cmi8328.c | 483 +++++++ sound/isa/gus/interwave.c | 5 +- sound/isa/opti9xx/miro.c | 15 +- sound/isa/opti9xx/opti92x-ad1848.c | 14 +- sound/isa/sb/emu8000.c | 15 +- sound/isa/sb/emu8000_callback.c | 2 +- sound/isa/wavefront/wavefront_synth.c | 2 +- sound/last.c | 1 - sound/oss/audio.c | 2 +- sound/oss/opl3.c | 2 +- sound/oss/pss.c | 2 +- sound/oss/sb_ess.c | 22 +- sound/oss/sb_mixer.c | 4 +- sound/oss/sys_timer.c | 4 +- sound/oss/uart6850.c | 2 +- sound/pci/ac97/ac97_patch.c | 24 +- sound/pci/ali5451/ali5451.c | 10 +- sound/pci/als300.c | 2 +- sound/pci/als4000.c | 4 +- sound/pci/asihpi/asihpi.c | 4 +- sound/pci/atiixp.c | 15 +- sound/pci/atiixp_modem.c | 6 +- sound/pci/au88x0/au88x0_game.c | 2 +- sound/pci/au88x0/au88x0_pcm.c | 2 +- sound/pci/azt3328.c | 6 +- sound/pci/ca0106/ca0106.h | 4 +- sound/pci/ca0106/ca0106_main.c | 30 +- sound/pci/ca0106/ca0106_mixer.c | 4 +- sound/pci/cmipci.c | 12 +- sound/pci/cs4281.c | 6 +- sound/pci/cs46xx/cs46xx.c | 2 +- sound/pci/cs46xx/cs46xx.h | 2 +- sound/pci/cs46xx/cs46xx_lib.c | 8 +- sound/pci/cs46xx/cs46xx_lib.h | 2 +- sound/pci/cs46xx/dsp_spos.c | 8 +- sound/pci/cs46xx/dsp_spos_scb_lib.c | 2 +- sound/pci/cs5530.c | 3 +- sound/pci/cs5535audio/Makefile | 2 +- sound/pci/cs5535audio/cs5535audio.c | 2 +- sound/pci/ctxfi/ctatc.c | 4 +- sound/pci/ctxfi/ctatc.h | 2 +- sound/pci/ctxfi/cthardware.h | 2 +- sound/pci/ctxfi/cthw20k1.c | 4 +- sound/pci/ctxfi/cthw20k2.c | 4 +- sound/pci/ctxfi/ctmixer.c | 4 +- sound/pci/ctxfi/ctmixer.h | 2 +- sound/pci/ctxfi/ctpcm.c | 52 +- sound/pci/ctxfi/xfi.c | 2 +- sound/pci/echoaudio/echoaudio.c | 12 +- sound/pci/echoaudio/echoaudio.h | 2 +- sound/pci/emu10k1/emu10k1.c | 4 +- sound/pci/emu10k1/emu10k1_callback.c | 2 +- sound/pci/emu10k1/emu10k1_main.c | 8 +- sound/pci/emu10k1/emu10k1x.c | 21 + sound/pci/emu10k1/emufx.c | 2 +- sound/pci/emu10k1/emupcm.c | 2 +- sound/pci/emu10k1/memory.c | 4 +- sound/pci/emu10k1/p16v.c | 2 +- sound/pci/ens1370.c | 70 +- sound/pci/es1938.c | 6 +- sound/pci/es1968.c | 12 +- sound/pci/fm801.c | 13 +- sound/pci/hda/Kconfig | 10 +- sound/pci/hda/hda_auto_parser.c | 56 +- sound/pci/hda/hda_codec.c | 276 ++-- sound/pci/hda/hda_codec.h | 82 +- sound/pci/hda/hda_generic.c | 8 +- sound/pci/hda/hda_hwdep.c | 43 +- sound/pci/hda/hda_intel.c | 306 +++- sound/pci/hda/hda_jack.c | 37 +- sound/pci/hda/hda_jack.h | 9 + sound/pci/hda/hda_local.h | 2 +- sound/pci/hda/hda_proc.c | 9 +- sound/pci/hda/hda_trace.h | 26 + sound/pci/hda/patch_analog.c | 90 +- sound/pci/hda/patch_cirrus.c | 225 +-- sound/pci/hda/patch_conexant.c | 78 +- sound/pci/hda/patch_hdmi.c | 407 +++++- sound/pci/hda/patch_realtek.c | 119 +- sound/pci/hda/patch_sigmatel.c | 115 +- sound/pci/hda/patch_via.c | 37 +- sound/pci/ice1712/aureon.c | 4 +- sound/pci/ice1712/ice1712.h | 2 +- sound/pci/ice1712/ice1724.c | 4 +- sound/pci/ice1712/juli.c | 4 +- sound/pci/ice1712/prodigy_hifi.c | 4 +- sound/pci/intel8x0.c | 26 +- sound/pci/intel8x0m.c | 4 +- sound/pci/korg1212/korg1212.c | 4 +- sound/pci/maestro3.c | 10 +- sound/pci/mixart/mixart_hwdep.c | 2 +- sound/pci/nm256/nm256.c | 4 +- sound/pci/oxygen/oxygen.c | 2 +- sound/pci/oxygen/oxygen.h | 2 +- sound/pci/oxygen/oxygen_lib.c | 4 +- sound/pci/oxygen/virtuoso.c | 2 +- sound/pci/pcxhr/pcxhr.c | 24 + sound/pci/pcxhr/pcxhr_hwdep.c | 6 +- sound/pci/riptide/riptide.c | 6 +- sound/pci/sis7019.c | 6 +- sound/pci/trident/trident.c | 2 +- sound/pci/trident/trident_main.c | 4 +- sound/pci/via82xx.c | 33 +- sound/pci/via82xx_modem.c | 4 +- sound/pci/vx222/vx222.c | 2 +- sound/pci/ymfpci/ymfpci.c | 2 +- sound/pci/ymfpci/ymfpci.h | 2 +- sound/pci/ymfpci/ymfpci_main.c | 26 +- sound/soc/Kconfig | 3 +- sound/soc/Makefile | 4 +- sound/soc/blackfin/bf5xx-ad1836.c | 73 +- sound/soc/{ep93xx => cirrus}/Kconfig | 0 sound/soc/{ep93xx => cirrus}/Makefile | 0 sound/soc/{ep93xx => cirrus}/edb93xx.c | 0 sound/soc/{ep93xx => cirrus}/ep93xx-ac97.c | 0 sound/soc/{ep93xx => cirrus}/ep93xx-i2s.c | 0 sound/soc/{ep93xx => cirrus}/ep93xx-pcm.c | 0 sound/soc/{ep93xx => cirrus}/ep93xx-pcm.h | 0 sound/soc/{ep93xx => cirrus}/simone.c | 0 sound/soc/{ep93xx => cirrus}/snappercl15.c | 0 sound/soc/codecs/Kconfig | 8 + sound/soc/codecs/Makefile | 4 + sound/soc/codecs/ab8500-codec.c | 13 +- sound/soc/codecs/ad1836.c | 88 +- sound/soc/codecs/ad193x.c | 50 +- sound/soc/codecs/ad1980.c | 1 - sound/soc/codecs/adau1373.c | 12 +- sound/soc/codecs/adau1701.c | 12 +- sound/soc/codecs/ak4671.c | 12 +- sound/soc/codecs/arizona.c | 110 +- sound/soc/codecs/arizona.h | 8 +- sound/soc/codecs/cs4270.c | 156 +- sound/soc/codecs/cs4271.c | 24 +- sound/soc/codecs/cs42l51.c | 19 +- sound/soc/codecs/cs42l52.c | 1 - sound/soc/codecs/da9055.c | 1510 ++++++++++++++++++++ sound/soc/codecs/isabelle.c | 1 - sound/soc/codecs/lm4857.c | 12 +- sound/soc/codecs/max98088.c | 18 +- sound/soc/codecs/max98095.c | 18 +- sound/soc/codecs/max9850.c | 12 +- sound/soc/codecs/max9877.c | 12 +- sound/soc/codecs/mc13783.c | 60 +- sound/soc/codecs/sta32x.c | 151 +- sound/soc/codecs/sta529.c | 2 +- sound/soc/codecs/stac9766.c | 1 - sound/soc/codecs/tlv320aic26.c | 12 +- sound/soc/codecs/tlv320aic32x4.c | 19 +- sound/soc/codecs/tlv320aic3x.c | 49 +- sound/soc/codecs/tlv320dac33.c | 19 +- sound/soc/codecs/tpa6130a2.c | 13 +- sound/soc/codecs/twl4030.c | 157 +- sound/soc/codecs/twl6040.c | 43 +- sound/soc/codecs/wm0010.c | 940 ++++++++++++ sound/soc/codecs/wm2000.c | 72 +- sound/soc/codecs/wm2200.c | 16 +- sound/soc/codecs/wm5100.c | 6 +- sound/soc/codecs/wm5102.c | 52 +- sound/soc/codecs/wm5110.c | 95 +- sound/soc/codecs/wm8510.c | 129 +- sound/soc/codecs/wm8523.c | 184 ++- sound/soc/codecs/wm8580.c | 149 +- sound/soc/codecs/wm8711.c | 65 +- sound/soc/codecs/wm8728.c | 60 +- sound/soc/codecs/wm8737.c | 132 +- sound/soc/codecs/wm8741.c | 115 +- sound/soc/codecs/wm8770.c | 19 +- sound/soc/codecs/wm8776.c | 75 +- sound/soc/codecs/wm8900.c | 166 ++- sound/soc/codecs/wm8903.c | 18 +- sound/soc/codecs/wm8904.c | 2 - sound/soc/codecs/wm8940.c | 18 +- sound/soc/codecs/wm8955.c | 18 +- sound/soc/codecs/wm8958-dsp2.c | 28 +- sound/soc/codecs/wm8960.c | 150 +- sound/soc/codecs/wm8961.c | 492 +++---- sound/soc/codecs/wm8971.c | 18 +- sound/soc/codecs/wm8974.c | 18 +- sound/soc/codecs/wm8978.c | 18 +- sound/soc/codecs/wm8983.c | 162 ++- sound/soc/codecs/wm8990.c | 8 +- sound/soc/codecs/wm8991.c | 25 +- sound/soc/codecs/wm8993.c | 2 + sound/soc/codecs/wm8994.c | 132 +- sound/soc/codecs/wm8994.h | 12 +- sound/soc/codecs/wm8996.c | 2 +- sound/soc/codecs/wm9090.c | 12 +- sound/soc/codecs/wm9712.c | 12 +- sound/soc/codecs/wm9713.c | 1 - sound/soc/codecs/wm_hubs.c | 119 +- sound/soc/codecs/wm_hubs.h | 6 + sound/soc/davinci/davinci-evm.c | 19 +- sound/soc/davinci/davinci-i2s.c | 13 +- sound/soc/davinci/davinci-mcasp.c | 260 +++- sound/soc/davinci/davinci-mcasp.h | 6 +- sound/soc/davinci/davinci-pcm.c | 24 +- sound/soc/davinci/davinci-pcm.h | 6 +- sound/soc/davinci/davinci-sffsdr.c | 2 +- sound/soc/davinci/davinci-vcif.c | 8 + sound/soc/fsl/Kconfig | 2 +- sound/soc/fsl/eukrea-tlv320.c | 37 +- sound/soc/fsl/fsl_dma.c | 6 - sound/soc/fsl/imx-audmux.c | 3 - sound/soc/fsl/imx-pcm-dma.c | 5 +- sound/soc/fsl/imx-ssi.c | 30 +- sound/soc/fsl/mpc5200_dma.c | 24 +- sound/soc/fsl/mpc5200_dma.h | 3 + sound/soc/fsl/mpc5200_psc_ac97.c | 10 + sound/soc/fsl/mpc5200_psc_i2s.c | 8 + sound/soc/fsl/mpc8610_hpcd.c | 32 +- sound/soc/fsl/mx27vis-aic32x4.c | 42 +- sound/soc/fsl/p1022_ds.c | 31 +- sound/soc/fsl/pcm030-audio-fabric.c | 100 +- sound/soc/mid-x86/mfld_machine.c | 9 + sound/soc/mid-x86/sst_dsp.h | 134 ++ sound/soc/mid-x86/sst_platform.c | 204 ++- sound/soc/mid-x86/sst_platform.h | 26 +- sound/soc/mxs/mxs-saif.c | 20 +- sound/soc/omap/Kconfig | 51 +- sound/soc/omap/Makefile | 10 +- sound/soc/omap/am3517evm.c | 21 +- sound/soc/omap/igep0020.c | 120 -- sound/soc/omap/mcbsp.c | 54 +- sound/soc/omap/mcbsp.h | 3 - sound/soc/omap/omap-abe-twl6040.c | 145 +- sound/soc/omap/omap-dmic.c | 9 +- sound/soc/omap/omap-hdmi.c | 17 +- sound/soc/omap/omap-mcbsp.c | 230 +-- sound/soc/omap/omap-mcbsp.h | 20 - sound/soc/omap/omap-mcpdm.c | 92 +- sound/soc/omap/omap-pcm.c | 236 +-- sound/soc/omap/omap-pcm.h | 4 +- sound/soc/omap/omap-twl4030.c | 188 +++ sound/soc/omap/omap3beagle.c | 150 -- sound/soc/omap/omap3evm.c | 118 -- sound/soc/omap/overo.c | 122 -- sound/soc/omap/zoom2.c | 4 - sound/soc/samsung/Kconfig | 11 +- sound/soc/samsung/Makefile | 2 + sound/soc/samsung/bells.c | 346 +++++ sound/soc/samsung/speyside.c | 42 +- sound/soc/sh/fsi.c | 28 +- sound/soc/soc-compress.c | 294 ++++ sound/soc/soc-core.c | 100 +- sound/soc/soc-dapm.c | 67 +- sound/soc/soc-dmaengine-pcm.c | 6 +- sound/soc/soc-jack.c | 6 - sound/soc/tegra/tegra_wm8903.c | 3 +- sound/soc/ux500/ux500_msp_dai.c | 3 + sound/soc/ux500/ux500_msp_i2s.c | 2 + sound/sparc/amd7930.c | 4 +- sound/sparc/dbri.c | 2 +- sound/usb/6fire/firmware.c | 5 +- sound/usb/card.c | 2 + sound/usb/card.h | 7 +- sound/usb/endpoint.c | 39 +- sound/usb/endpoint.h | 5 +- sound/usb/helper.c | 5 + sound/usb/mixer.c | 7 + sound/usb/pcm.c | 126 +- sound/usb/quirks-table.h | 53 + sound/usb/quirks.c | 24 + sound/usb/quirks.h | 10 + 363 files changed, 10800 insertions(+), 4219 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/cs4270.txt create mode 100644 Documentation/devicetree/bindings/sound/cs4271.txt create mode 100644 Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt create mode 100644 Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt create mode 100644 Documentation/devicetree/bindings/sound/omap-mcbsp.txt create mode 100644 Documentation/devicetree/bindings/sound/omap-twl4030.txt create mode 100644 Documentation/devicetree/bindings/sound/tlv320aic3x.txt create mode 100644 Documentation/sound/alsa/Channel-Mapping-API.txt create mode 100644 arch/arm/mach-davinci/asp.h create mode 100644 include/linux/platform_data/asoc-mx27vis.h rename arch/arm/mach-davinci/include/mach/asp.h => include/linux/platform_data/davinci_asp.h (56%) create mode 100644 include/linux/platform_data/omap-twl4030.h create mode 100644 include/sound/da9055.h rename arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h => include/sound/tegra_wm8903.h (89%) delete mode 100644 include/sound/version.h create mode 100644 include/sound/wm0010.h create mode 100644 sound/isa/cmi8328.c rename sound/soc/{ep93xx => cirrus}/Kconfig (100%) rename sound/soc/{ep93xx => cirrus}/Makefile (100%) rename sound/soc/{ep93xx => cirrus}/edb93xx.c (100%) rename sound/soc/{ep93xx => cirrus}/ep93xx-ac97.c (100%) rename sound/soc/{ep93xx => cirrus}/ep93xx-i2s.c (100%) rename sound/soc/{ep93xx => cirrus}/ep93xx-pcm.c (100%) rename sound/soc/{ep93xx => cirrus}/ep93xx-pcm.h (100%) rename sound/soc/{ep93xx => cirrus}/simone.c (100%) rename sound/soc/{ep93xx => cirrus}/snappercl15.c (100%) create mode 100644 sound/soc/codecs/da9055.c create mode 100644 sound/soc/codecs/wm0010.c create mode 100644 sound/soc/mid-x86/sst_dsp.h delete mode 100644 sound/soc/omap/igep0020.c create mode 100644 sound/soc/omap/omap-twl4030.c delete mode 100644 sound/soc/omap/omap3beagle.c delete mode 100644 sound/soc/omap/omap3evm.c delete mode 100644 sound/soc/omap/overo.c create mode 100644 sound/soc/samsung/bells.c create mode 100644 sound/soc/soc-compress.c