aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-09-22ASoC: omap-mcpdm: Use platform_get_resource_* to get resourcesPeter Ujfalusi1-4/+23
Get the needed resources in a correct way and avoid using defines for them. Signed-off-by: Peter Ujfalusi <[email protected]> Tested-by: Janusz Krzysztofik <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-22ARM: OMAP4: hwmod_data: Add resource names to McPDM memory rangesPeter Ujfalusi1-0/+2
To help the driver to get the correct memory range to access McPDM registers. Signed-off-by: Peter Ujfalusi <[email protected]> Tested-by: Janusz Krzysztofik <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-22ASoC: omap-pcm: Prepare to configure the DMA data_type based on stream ↵Peter Ujfalusi1-2/+29
properties Based on the format of the stream the omap-pcm can decide alone what data type should be used with by the sDMA. Keep the possibility for OMAP dai drivers to tell omap-pcm if they want to use different data type. This is needed for the omap-hdmi for example which needs 32bit data type even if the stream format is S16_LE. The check if (dma_data->data_type) is safe at the moment since omap-pcm does not support 8bit samples (OMAP_DMA_DATA_TYPE_S8 == 0x00). The next step is to redefine the meaning of dma_data->data_type to unblock this limitation. Signed-off-by: Peter Ujfalusi <[email protected]> Tested-by: Janusz Krzysztofik <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-22ASoC: OMAP: Remove sync_mode from omap_pcm_dma_data structPeter Ujfalusi5-9/+1
The omap-pcm platform driver no longer needs this parameter to select between ELEMENT and PACKET mode. The selection is based on the configured packet_size. Signed-off-by: Peter Ujfalusi <[email protected]> Tested-by: Janusz Krzysztofik <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-22ASoC: omap-pcm: Select sDMA synchronization based on packet_sizePeter Ujfalusi1-1/+6
Since we only have element or packet synchronization we can use the dma_data->packet_size to select the desired mode: if packet_size is 0 we use ELEMENT mode if packet_size is not 0 we use PACKET mode for sDMA synchronization. Signed-off-by: Peter Ujfalusi <[email protected]> Tested-by: Janusz Krzysztofik <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-22ASoC: omap-mcbsp: Use sDMA packet mode instead of frame modePeter Ujfalusi1-30/+17
When McBSP is configured in threshold mode we can use sDMA packet mode in all cases. Signed-off-by: Peter Ujfalusi <[email protected]> Tested-by: Janusz Krzysztofik <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-22dmaengine: omap-dma: Add support to suppress interrupts in cyclic modePeter Ujfalusi1-2/+5
When requested (DMA_PREP_INTERRUPT is cleared in flags) disable all DMA interrupts for the channel. In this mode user space does not expect periodic reports from kernel about the progress of the audio stream. PulseAudio for example support this type of mode. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Vinod Koul <[email protected]> Tested-by: Janusz Krzysztofik <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-22dmaengine: Pass flags via device_prep_dma_cyclic() callbackPeter Ujfalusi13-14/+19
Change the parameter list of device_prep_dma_cyclic() so the DMA drivers can receive the flags coming from clients. This feature can be used during audio operation to disable all audio related interrupts when the DMA_PREP_INTERRUPT is cleared from the flags. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Nicolas Ferre <[email protected]> Acked-by: Shawn Guo <[email protected]> Acked-by: Vinod Koul <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-22dmaengine: omap: Add support for pause/resume in cyclic dma modePeter Ujfalusi1-5/+25
The audio stack used omap_stop_dma/omap_start_dma to pause/resume the DMA. This method has been used for years on OMAP based products. We only allow pause/resume when the DMA has been configured in cyclic mode which is used by the audio stack. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Vinod Koul <[email protected]> Tested-by: Janusz Krzysztofik <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-22dmaengine: omap: Support for element mode in cyclic DMAPeter Ujfalusi1-1/+4
When src_maxburst/dst_maxburst is set to 0 by the users of cyclic DMA (mostly audio) indicates that we should configure the omap DMA to element sync mode instead of packet mode. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Vinod Koul <[email protected]> Tested-by: Janusz Krzysztofik <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-22ASoC: fsl: register the wm9712-codecEric Millbrandt1-3/+29
The mpc5200-psc-ac97 driver does not enumerate attached ac97 devices, so register the device here. Signed-off-by: Eric Millbrandt <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-22ASoC: fsl: pcm030-audio-fabric use snd_soc_register_cardEric Millbrandt1-18/+47
Convert pcm030-audio-fabric to use the new snd_soc_register_card api instead of the older method of registering a separate platform device. Create the dai_link to the mpc5200_psc_ac97 platform using the device tree. Convert the pcm030-audio-fabric driver to a platform-driver and add a remove function. Signed-off-by: Eric Millbrandt <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-22ASoC: fsl: add PPC_MPC52xx dependency to SND_POWERPC_SOCEric Millbrandt1-1/+1
mpc52xx socs do not define FSL_SOC but need SND_POWERPC_SOC defined to build ASoC drivers. Signed-off-by: Eric Millbrandt <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-22ASoC: twl6040: Convert to use DAI DAPM widgetsPeter Ujfalusi1-14/+29
Use DAPM mapping for stream events and give unique names for the streams. This change also fixes the following warning: twl6040-codec twl6040-codec: Failed to create Capture debugfs file Signed-off-by: Peter Ujfalusi <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-22ASoC: twl4030: Convert to use DAI DAPM widgetsPeter Ujfalusi1-20/+28
Use DAPM mapping for stream events and give unique names for the streams. This change also fixes the following warning: twl4030-codec twl4030-codec: Failed to create Capture debugfs file Signed-off-by: Peter Ujfalusi <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-21ASoC: wm8960: remove 'dres' field from platform data structureTimur Tabi2-7/+0
The 'dres' field (discharge resistance for headphone outputs) is no longer used in the driver, so remove it. It was used in the original version of the driver when entering standby from off, but we stopped using it when we switched from having a single startup sequence to having separate cap and capless sequences. Signed-off-by: Timur Tabi <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-20Documentation: Define the MSP Driver Device Tree bindingsLee Jones1-0/+43
Here we add the required documentation for the new Device Tree bindings pertaining to the MSP CPU-side DAI Driver. Acked-by: Ola Lilja <[email protected]> Signed-off-by: Lee Jones <[email protected]>
2012-09-20Documentation: Define the MOP500 Audio Machine Driver Device Tree bindingsLee Jones1-0/+39
Here we add the required documentation for the new Device Tree bindings pertaining to the MOP500 Audio Machine driver. Acked-by: Ola Lilja <[email protected]> Signed-off-by: Lee Jones <[email protected]>
2012-09-20ASoC: Ux500: Minor coding layout changesLee Jones1-5/+2
Includes removal of duplicate debug print affirming entry into the probe function, an unnecessary line break of a coding line <80 chars and a white space change (unintentional tab). Acked-by: Ola Lilja <[email protected]> Signed-off-by: Lee Jones <[email protected]>
2012-09-20ASoC: codecs: Enable AB8500 CODEC for Device TreeLee Jones2-2/+85
We continue to allow the AB8500 CODEC to be registered via the AB8500 Multi Functional Device API, only this time we extract its configuration from the Device Tree binary. Acked-by: Ola Lilja <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Lee Jones <[email protected]>
2012-09-20ASoC: Ux500: Enable ux500 MSP driver for Device TreeLee Jones2-3/+25
Register both parts of the MSP driver from Device Tree so that they are probed when Device Tree is enabled. Also, as there is platform data involved, we ensure that there is allocated memory to place the configuration into and that the correct information is extracted from the DT binary. Acked-by: Ola Lilja <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Lee Jones <[email protected]>
2012-09-20ASoC: Ux500: Enable MOP500 driver for Device TreeLee Jones1-0/+40
Here we ensure that the MOP500 audio driver will be probed during a Device Tree boot. We also parse the sound node to link together the codec, dma and the CPU-side Digital Audio Interface. Acked-by: Ola Lilja <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Lee Jones <[email protected]>
2012-09-20ASoC: Ux500: Move MSP pinctrl setup into the MSP driverLee Jones4-98/+58
In the initial submission of the MSP driver msp1 and msp3's associated pinctrl mechanism was passed back to platform code using a plat_init() call-back routine, but it has no place in platform code. The MSP driver should set this up for the appropriate ports. Instead we use a use_pinctrl identifier which is passed from platform_data/Device Tree which indicates which ports should use pinctrl. Acked-by: Ola Lilja <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Lee Jones <[email protected]>
2012-09-18ASoC: wm8961: Move device identification and reset to I2C probeMark Brown1-27/+33
This is more idiomatic as it means we verify that the device is there prior to trying to do the card probe. Signed-off-by: Mark Brown <[email protected]>
2012-09-18ASoC: wm8961: Convert to direct regmap API usageMark Brown1-265/+161
Signed-off-by: Mark Brown <[email protected]>
2012-09-18ASoC: wm8960: Support shared LRCLKMark Brown2-0/+13
If the LRCLK is shared and the WM8960 is clock master then we should enable the LRCM bit to tell the device that it should drive LRCLK when either ADC or DAC is enabled rather than separately driving the two LRCLKs. Signed-off-by: Mark Brown <[email protected]>
2012-09-18ASoC: wm8776: Convert to direct regmap API usageMark Brown1-15/+60
Signed-off-by: Mark Brown <[email protected]>
2012-09-18ASoC: fsl: cleanup headers in pcm030-audio-fabricEric Millbrandt1-9/+0
Remove unreferenced header files. Signed-off-by: Eric Millbrandt <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-18ASoC: fsl: mpc5200 add missing information to snd_soc_dai_driverEric Millbrandt2-0/+8
Add missing dai_driver information to avoid these runtime errors [ 16.433788] asoc: error - multiple DAI f0002c00.i2s registered with no name [ 16.453551] Failed to register DAI [ 16.461222] mpc5200-psc-i2s: probe of f0002c00.i2s failed with error -22 [ 16.475242] asoc: error - multiple DAI f0002000.ac97 registered with no name [ 16.488087] mpc5200-psc-ac97 f0002000.ac97: Failed to register DAI [ 16.502222] mpc5200-psc-ac97: probe of f0002000.ac97 failed with error -22 Signed-off-by: Eric Millbrandt <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-18ASoC: fsl: mpc5200 combine psc_dma platform dataEric Millbrandt4-20/+17
The mpc5200_psc_ac97 and mpc5200_psc_i2s modules rely on shared platform data with mpc5200_dma. Signed-off-by: Eric Millbrandt <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-18ASoC: imx-audmux: remove null check of audmux_base in audmux_read_fileRichard Zhao1-3/+0
When audmux_read_file is called, it means the driver is already initialised successfully, so we don't need to check audmux_base. It also fix smatch warning: sound/soc/fsl/imx-audmux.c:78 audmux_read_file() warn: possible memory leak of 'buf' Signed-off-by: Richard Zhao <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-18ASoC: imx-pcm-dma: open function failed when snd_dmaengine_pcm_open failRichard Zhao1-1/+1
snd_imx_open should return error code returned by snd_dmaengine_pcm_open. Signed-off-by: Richard Zhao <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-18ASoC: imx-pcm-dma: check kzalloc return value in function snd_imx_openRichard Zhao1-0/+3
It fixed smatch warning: sound/soc/fsl/imx-pcm-dma.c:112 snd_imx_open() error: potential null dereference 'dma_data'. (kzalloc returns null) Signed-off-by: Richard Zhao <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-18ASoC: Avoid recalculating the bitmask for SOC_ENUM controlsLars-Peter Clausen4-30/+20
For ENUM controls the bitmask is calculated based on the number of items. Currently this is done each time the control is accessed. And while the performance impact of this should be negligible we can easily do better. The roundup_pow_of_two macro performs the same calculation which is currently done manually, but it is also possible to use this macro with compile time constants and so it can be used to initialize static data. So we can use it to initialize the mask field of a ENUM control during its declaration. Signed-off-by: Lars-Peter Clausen <[email protected]> Acked-by: Peter Ujfalusi <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-18ASoC: wm8960: add support for big-endian audio samplesTimur Tabi1-1/+8
PowerPC ASoC drivers frequently use the _BE variants of the SNDRV_PCM_FORMAT macros, so we need to look for those as well. Signed-off-by: Timur Tabi <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-18ASoC: fsl: remove unnecessary call to dma_unmap_singleTimur Tabi1-6/+0
Remove a call to dma_unmap_single() from the PowerPC ASoC DMA driver. The buffer is allocated and not actually mapped, so the unmap call doesn't make sense. It was probably left over from some early version of the driver. This bug was unnoticed for so long because the DMA mapping functions normally don't do anything on PowerPC. Signed-off-by: Timur Tabi <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-18ASoC: fsl: use snd_soc_register_card to register the cardTimur Tabi2-50/+13
Use snd_soc_register_card() instead of platform_device_alloc("soc-audio") to register the sound card from the machine drivers. The use of platform_device_alloc is deprecated. Although several other drivers still use platform_device_alloc(), the Freescale drivers were not using it to pass driver data. Instead of fixing the driver data usage, it's better to replace the deprecated code. Signed-off-by: Timur Tabi <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-17ASoC: mx27vis: retrieve gpio numbers from platform_dataShawn Guo3-23/+72
Rather than including mach/iomux-mx27.h to define gpio numbers and set up the pins, the patch moves all these into machine code and has the gpio numbers passed to driver via platform_data. As the result, we can remove the mach/iomux-mx27.h inclusion from driver. Signed-off-by: Shawn Guo <[email protected]> Acked-by: Javier Martin <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-16Linux 3.6-rc6Linus Torvalds1-1/+1
2012-09-16Merge tag 'mfd-for-linus-3.6-2' of ↵Linus Torvalds58-247/+343
git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 Pull mfd fixes from Samuel Ortiz: "This is the remaining MFD fixes for 3.6, with 5 pending fixes: - A tps65217 build error fix. - A lcp_ich regression fix caused by the MFD driver failing to initialize the watchdog sub device due to ACPI conflicts. - 2 MAX77693 interrupt handling bug fixes. - An MFD core fix, adding an IRQ domain argument to the MFD device addition API in order to prevent silent and potentially harmful remapping behaviour changes for drivers supporting non-DT platforms." * tag 'mfd-for-linus-3.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: mfd: MAX77693: Fix NULL pointer error when initializing irqs mfd: MAX77693: Fix interrupt handling bug mfd: core: Push irqdomain mapping out into devices mfd: lpc_ich: Fix a 3.5 kernel regression for iTCO_wdt driver mfd: Move tps65217 regulator plat data handling to regulator
2012-09-16Merge tag 'for-3.6-rc6' of git://gitorious.org/linux-pwm/linux-pwmLinus Torvalds2-0/+36
Pull pwm fixes from Thierry Reding: "While this comes a bit later than I had wished, both patches are rather minor and touch only new drivers so I think these are still safe for merging." * tag 'for-3.6-rc6' of git://gitorious.org/linux-pwm/linux-pwm: pwm: pwm-tiehrpwm: Fix conflicting channel period setting pwm: pwm-tiecap: Disable APWM mode after configure
2012-09-16Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pendingLinus Torvalds10-126/+141
Pull scsi target fixes from Nicholas Bellinger: "Here is the current set of target-pending fixes headed for v3.6-final The main parts of this series include bug-fixes from Paolo Bonzini to address an use-after-free bug in pSCSI sense exception handling, along with addressing some long-standing bugs wrt the handling of zero- length SCSI CDB payloads also specific to pSCSI pass-through device backends." * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: target: go through normal processing for zero-length REQUEST_SENSE target: support zero allocation length in REQUEST SENSE target: support zero-size allocation lengths in transport_kmap_data_sg target: fail REPORT LUNS with less than 16 bytes of payload target: report too-small parameter lists everywhere target: go through normal processing for zero-length PSCSI commands target: fix use-after-free with PSCSI sense data target: simplify code around transport_get_sense_data target: move transport_get_sense_data target: Check idr_get_new return value in iscsi_login_zero_tsih_s1 target: Fix ->data_length re-assignment bug with SCSI overflow
2012-09-16Merge tag 'pm-for-3.6-rc6' of ↵Linus Torvalds2-12/+34
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm Pull power management fixes from Rafael J. Wysocki: "Three ACPI device power management fixes related to checking and setting device power states." * tag 'pm-for-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI / PM: Use KERN_DEBUG when no power resources are found ACPI / PM: Fix resource_lock dead lock in acpi_power_on_device ACPI / PM: Infer parent power state from child if unknown, v2
2012-09-16Merge branch 'for-linus' of ↵Linus Torvalds1-6/+2
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull a btrfs revert from Chris Mason: "My for-linus branch has one revert in the new quota code. We're building up more fixes at etc for the next merge window, but I'm keeping them out unless they are bigger regressions or have a huge impact." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Revert "Btrfs: fix some error codes in btrfs_qgroup_inherit()"
2012-09-16Merge tag 'sound-3.6' of ↵Linus Torvalds13-40/+23
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound Pull more sound fixes from Takashi Iwai: "Yet more (a bunch of) small fixes that slipped from the previous pull request. Most of commits are pending ASoC fixes, all of which are fairly trivial commits." * tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ASoC: wm8904: correct the index ALSA: hda - Yet another position_fix quirk for ASUS machines ASoC: tegra: fix maxburst settings in dmaengine code ASoC: samsung dma - Don't indicate support for pause/resume. ASoC: mc13783: Remove mono support ASoC: arizona: Fix typo in 44.1kHz rates ASoC: spear: correct the check for NULL dma_buffer pointer sound: tegra_alc5632: remove HP detect GPIO inversion ASoC: atmel-ssc: include linux/io.h for raw io ASoC: dapm: Don't force card bias level to be updated ASoC: dapm: Make sure we update the bias level for CODECs with no op ASoC: am3517evm: fix error return code ASoC: ux500_msp_i2s: better use devm functions and fix error return code ASoC: imx-sgtl5000: fix error return code
2012-09-16Revert "sched: Improve scalability via 'CPU buddies', which withstand random ↵Linus Torvalds3-46/+22
perturbations" This reverts commit 970e178985cadbca660feb02f4d2ee3a09f7fdda. Nikolay Ulyanitsky reported thatthe 3.6-rc5 kernel has a 15-20% performance drop on PostgreSQL 9.2 on his machine (running "pgbench"). Borislav Petkov was able to reproduce this, and bisected it to this commit 970e178985ca ("sched: Improve scalability via 'CPU buddies' ...") apparently because the new single-idle-buddy model simply doesn't find idle CPU's to reschedule on aggressively enough. Mike Galbraith suspects that it is likely due to the user-mode spinlocks in PostgreSQL not reacting well to preemption, but we don't really know the details - I'll just revert the commit for now. There are hopefully other approaches to improve scheduler scalability without it causing these kinds of downsides. Reported-by: Nikolay Ulyanitsky <[email protected]> Bisected-by: Borislav Petkov <[email protected]> Acked-by: Mike Galbraith <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Ingo Molnar <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2012-09-16mfd: MAX77693: Fix NULL pointer error when initializing irqsChanwoo Choi2-7/+26
This patch initialize register map of MUIC device because mfd driver of Maxim MAX77693 use regmap-muic instance of MUIC device when irqs of Maxim MAX77693 is initialized before call max77693-muic probe() function. Signed-off-by: Chanwoo Choi <[email protected]> Signed-off-by: Myungjoo Ham <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Reported-by: Sylwester Nawrocki <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2012-09-16mfd: MAX77693: Fix interrupt handling bugChanwoo Choi1-5/+31
This patch fix bug related to interrupt handling for MAX77693 devices. - Unmask interrupt masking bit for charger/flash/muic to revolve that interrupt isn't happened when external connector is attached. - Fix wrong regmap instance when muic interrupt is happened. This patch were discussed and confirm discussion about this patch on below url: http://lkml.org/lkml/2012/7/16/118 Signed-off-by: Chanwoo Choi <[email protected]> Signed-off-by: Myungjoo Ham <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2012-09-15mfd: core: Push irqdomain mapping out into devicesMark Brown54-112/+125
Currently the MFD core supports remapping MFD cell interrupts using an irqdomain but only if the MFD is being instantiated using device tree and only if the device tree bindings use the pattern of registering IPs in the device tree with compatible properties. This will be actively harmful for drivers which support non-DT platforms and use this pattern for their DT bindings as it will mean that the core will silently change remapping behaviour and it is also limiting for drivers which don't do DT with this particular pattern. There is also a potential fragility if there are interrupts not associated with MFD cells and all the cells are omitted from the device tree for some reason. Instead change the code to take an IRQ domain as an optional argument, allowing drivers to take the decision about the parent domain for their interrupts. The one current user of this feature is ab8500-core, it has the domain lookup pushed out into the driver. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2012-09-15Merge tag 'asoc-3.6' of ↵Takashi Iwai474-2871/+5042
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus ASoC: Updates for 3.6 A bigger set of updates than I'm entirely comfortable with - things backed up a bit due to travel. As ever the majority of these are small, focused updates for specific drivers though there are a couple of core changes. There's been good exposure in -next. The AT91 patch fixes a build break.