Mark Brown [Thu, 22 Aug 2013 13:29:02 +0000 (14:29 +0100)]
Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:29:02 +0000 (14:29 +0100)]
Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:29:01 +0000 (14:29 +0100)]
Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:29:00 +0000 (14:29 +0100)]
Merge remote-tracking branch 'asoc/topic/wm8904' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:29:00 +0000 (14:29 +0100)]
Merge remote-tracking branch 'asoc/topic/wm8782' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:59 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/wm8753' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:59 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/wm8731' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:58 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/wm8727' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:58 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/wm8350' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:57 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:57 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/wl1273' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:56 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:55 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/uda134x' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:55 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/txx9' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:54 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:53 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:53 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:52 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/tlv320aic26' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:52 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:51 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/sta32x' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:50 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/spdif' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:50 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:49 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/sgtl5000' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:49 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:48 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/s6000' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:48 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:47 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:46 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:46 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/pcm3008' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:45 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:45 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:44 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/omap' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:44 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/nuc900' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:43 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/new-pcm' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:43 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:42 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:42 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/max9877' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:41 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:41 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/max9768' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:40 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/lm4857' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:39 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:39 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:38 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:38 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:37 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:32 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:32 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:31 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/cs4270' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:31 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:30 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/compress' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:30 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/bt' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:29 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/blackfin' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:29 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/au1x' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:28 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:27 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:27 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/ak5386' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:26 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/ak4554' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:25 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:25 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:24 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/ads711x' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:24 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/adav80x' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:23 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/adau1701' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:23 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/
ad73311' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:22 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/ad1980' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:22 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/ac97' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:21 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/fix/wm8960' into asoc-linus
Tushar Behera [Thu, 22 Aug 2013 12:45:02 +0000 (18:15 +0530)]
ASoC: samsung: Fix build error with dma function rename
commit
85ff3c29d720 ("ASoC: samsung: Rename DMA platform registration
functions") renames the DMA registration functions. Fix the places where
it was left out.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Michael Grzeschik [Mon, 19 Aug 2013 15:06:01 +0000 (17:06 +0200)]
ASoC: fsl: disable ssi irq for imx
We have to disable the ssi irq, as it is not safe for all platforms to
write back into the status register. It also runs into non-linefetch
aborts.
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Michael Grzeschik [Mon, 19 Aug 2013 15:06:00 +0000 (17:06 +0200)]
ASoC: fsl-ssi: imx-pcm-fiq bugfix
imx-pcm-fiq is checking for TE RE bits, so enable them only if
necessary.
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Steffen Trumtrar [Mon, 19 Aug 2013 15:05:59 +0000 (17:05 +0200)]
ASoC: fsl-ssi: add SSIEN errata work around
The chip errata for the i.MX35, Rev.2 has the following errata:
ENGcm06222: SSI:Transmission does not take place in bit length early frame sync
configuration
The workaround states, that TX_EN and SSI_EN bits should be set in the same
register write. As the next errata in the document (ENGcm06532) says to always
write RX_EN and TX_EN in the same register write in network mode.
Therefore include the whole write to
CCSR_SSI_SCR_TE and CCSR_SSI_SCR_RE
into the write to
CCSR_SSI_SCR_SSIEN
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Markus Pargmann [Mon, 19 Aug 2013 15:05:58 +0000 (17:05 +0200)]
ASoC: fsl-ssi: ac97-slave support
This patch adds ac97-slave support.
For ac97, the registers have to be setup earlier than for other ssi
modes because there is some communication with the external device
before streaming. So this patch introduces a fsl_ssi_setup function to
setup the registers for different ssi operation modes seperately.
This patch was tested with imx27-pca100.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Thu, 22 Aug 2013 10:09:03 +0000 (11:09 +0100)]
Merge remote-tracking branch 'asoc/topic/ac97' into asoc-fsl
Nicolin Chen [Wed, 21 Aug 2013 03:13:16 +0000 (11:13 +0800)]
ASoC: fsl: Add S/PDIF CPU DAI driver
This patch implements a device-tree-only CPU DAI driver for Freescale
S/PDIF controller that supports stereo playback and record feature.
Signed-off-by: Nicolin Chen <b42378@freescale.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Sachin Kamat [Thu, 22 Aug 2013 08:00:15 +0000 (13:30 +0530)]
ASoC: pxa: Remove duplicate inclusion of dmaengine.h
dmaengine.h header file was included twice.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Julia Lawall [Mon, 19 Aug 2013 08:51:51 +0000 (10:51 +0200)]
ASoC: omap: simplify platform_get_resource_byname/devm_ioremap_resource
Remove unneeded error handling on the result of a call to
platform_get_resource_byname when the value is passed to devm_ioremap_resource.
In the case of omap-dmic.c, the error-handling code of
devm_ioremap_resource is also corrected to include releasing the clock.
A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression pdev,res,e,e1;
expression ret != 0;
identifier l;
@@
res = platform_get_resource_byname(...);
- if (res == NULL) { ... \(goto l;\|return ret;\) }
e = devm_ioremap_resource(e1, res);
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Fabio Estevam [Sat, 17 Aug 2013 21:13:00 +0000 (18:13 -0300)]
ASoC: fsl: fsl_ssi: Fix the order of resources removal
In fsl_ssi_remove() we need to remove the resources in the opposite order that
they were acquired in probe.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Markus Pargmann [Mon, 19 Aug 2013 15:05:55 +0000 (17:05 +0200)]
ASoC: core: Generic ac97 link reset functions
This patch adds generic ac97 reset functions using pincontrol and gpio
parsed from devicetree.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 19 Aug 2013 21:59:05 +0000 (22:59 +0100)]
ASoC: samsung: Rename DMA platform registration functions
The current naming with a simple asoc_ prefix is too generic for use in
multiplatform kernels.
Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Sangbeom Kim <sbkim73@samsung.com>
Mark Brown [Mon, 19 Aug 2013 19:33:20 +0000 (20:33 +0100)]
ASoC: samsung: Check to see if we managed to allocate a channel
Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Sangbeom Kim <sbkim73@samsung.com>
Mark Brown [Fri, 16 Aug 2013 11:07:19 +0000 (12:07 +0100)]
ASoC: imx: Add MODULE_LICENSE to DMA drivers
Reported-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 19 Aug 2013 11:10:08 +0000 (12:10 +0100)]
ASoC: spdif: Remove duplicate const
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 19 Aug 2013 11:09:39 +0000 (12:09 +0100)]
ASoC: spdif: Add stub DAPM widgets for Rx
Ensure that the driver continues to work with mandatory DAPM.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 19 Aug 2013 11:16:19 +0000 (12:16 +0100)]
ASoC: bt-sco: Provide stub DAPM integration
Ensure continued operation with DAPM being mandatory.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 19 Aug 2013 11:13:14 +0000 (12:13 +0100)]
ASoC: bt-sco: Add generic compatible string
Provide a common compatible string for device trees to list as a fallback
for simplicity. We don't currently have a binding document but let's not
fix that right now...
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 19 Aug 2013 11:17:36 +0000 (12:17 +0100)]
ASoC: hdmi: Provide stub DAPM integration
Ensure continued operation with DAPM being mandatory.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 19 Aug 2013 11:18:07 +0000 (12:18 +0100)]
ASoC: ac97: Provide stub DAPM integration
Ensure continued operation with DAPM being mandatory.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 12 Aug 2013 22:59:19 +0000 (23:59 +0100)]
ASoC: wm8997: Add inputs for noise and mic mixers
The noise and mic mixer inputs were not connected, do so.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 12 Aug 2013 22:59:08 +0000 (23:59 +0100)]
ASoC: wm5110: Add inputs for noise and mic mixers
The noise and mic mixer inputs were not connected, do so.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 12 Aug 2013 22:58:58 +0000 (23:58 +0100)]
ASoC: wm5102: Add inputs for noise and mic mixers
The noise and mic mixer inputs were not connected, do so.
Signed-off-by: Mark Brown <broonie@linaro.org>
Linus Torvalds [Sun, 18 Aug 2013 21:36:53 +0000 (14:36 -0700)]
Linux 3.11-rc6
Mark Brown [Sun, 18 Aug 2013 17:36:06 +0000 (18:36 +0100)]
ASoC: wm8782: Add DAPM support
In order to make the device easier to hook up to external components in
system designs and ensure operation when DAPM support becomes mandatory
add DAPM support.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Sun, 18 Aug 2013 17:35:54 +0000 (18:35 +0100)]
ASoC: wm8727: Add DAPM support
In order to make the device easier to hook up to external components in
system designs and ensure operation when DAPM support becomes mandatory
add DAPM support.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Sun, 11 Aug 2013 11:29:07 +0000 (12:29 +0100)]
ASoC: cs4270: Add DAPM support
This makes it possible to hook the device into a more complex board and
ensures it will continue to work with non-DAPM support removed from the
core.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Sun, 18 Aug 2013 17:25:53 +0000 (18:25 +0100)]
ASoC: wl1273: Add stub DAPM support
In order to ensure that the device continues to work with DAPM support
being mandatory provide stub DAPM widgets and routes.
Note that the public information on the device appears to make no
mention of the FM support the driver appears to have.
Signed-off-by: Mark Brown <broonie@linaro.org>
Linus Torvalds [Sun, 18 Aug 2013 15:51:28 +0000 (08:51 -0700)]
Merge branch 'for-3.11-fixes' of git://git./linux/kernel/git/tj/cgroup
Pull cgroup fix from Tejun Heo:
"This contains one patch to fix the return value of cpuset's cgroups
interface function, which used to always return -ENODEV for the writes
on the 'memory_pressure_enabled' file"
* 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cpuset: fix the return value of cpuset_write_u64()
Mark Brown [Thu, 15 Aug 2013 11:04:28 +0000 (12:04 +0100)]
ASoC: pcm3008: Manage DAC and ADC power with DAPM
Rather than leaving the DAC and ADC active whenever the system is running
manage their power with DAPM.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Thu, 15 Aug 2013 11:01:40 +0000 (12:01 +0100)]
ASoC: pcm3008: Add DAPM support
Make it possible to connect external devices to the CODEC and ensure
continued operation with non-DAPM support removed from the core.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Thu, 15 Aug 2013 10:53:28 +0000 (11:53 +0100)]
ASoC: pcm3008: Use gpio_set_value_cansleep()
We don't set the GPIO values from atomic context so support GPIOs that
can't be controlled from atomic context.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mike Dyer [Fri, 16 Aug 2013 17:36:28 +0000 (18:36 +0100)]
ASoC: wm8960: Fix PLL register writes
Bit 9 of PLL2,3 and 4 is reserved as '0'. The 24bit fractional part
should be split across each register in 8bit chunks.
Signed-off-by: Mike Dyer <mike.dyer@md-soft.co.uk>
Signed-off-by: Mark Brown <broonie@linaro.org>
Cc: stable@vger.kernel.org
Fabio Estevam [Sat, 17 Aug 2013 19:38:12 +0000 (16:38 -0300)]
ASoC: fsl: Drop SND_SOC_FSL_UTILS from i.mx machine code
SND_SOC_FSL_UTILS is only used by PowerPC machines, so let's drop it in the
i.mx case.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>