Граф коммитов

7247 Коммитов

Автор SHA1 Сообщение Дата
Mark Brown 7254a2212f Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next 2013-08-22 14:29:02 +01:00
Mark Brown 5f081e1ebb Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next 2013-08-22 14:29:01 +01:00
Mark Brown 16f135f08f Merge remote-tracking branch 'asoc/topic/wm8904' into asoc-next 2013-08-22 14:29:00 +01:00
Mark Brown 1179ace13e Merge remote-tracking branch 'asoc/topic/wm8782' into asoc-next 2013-08-22 14:29:00 +01:00
Mark Brown a2e4b255c0 Merge remote-tracking branch 'asoc/topic/wm8753' into asoc-next 2013-08-22 14:28:59 +01:00
Mark Brown 0b05a05def Merge remote-tracking branch 'asoc/topic/wm8731' into asoc-next 2013-08-22 14:28:59 +01:00
Mark Brown ab4f0935a8 Merge remote-tracking branch 'asoc/topic/wm8727' into asoc-next 2013-08-22 14:28:58 +01:00
Mark Brown 2cb852b52d Merge remote-tracking branch 'asoc/topic/wm8350' into asoc-next 2013-08-22 14:28:58 +01:00
Mark Brown 662295940b Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next 2013-08-22 14:28:57 +01:00
Mark Brown 1518eb0abc Merge remote-tracking branch 'asoc/topic/wl1273' into asoc-next 2013-08-22 14:28:57 +01:00
Mark Brown 136823384f Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next 2013-08-22 14:28:56 +01:00
Mark Brown ac1cbbaa75 Merge remote-tracking branch 'asoc/topic/uda134x' into asoc-next 2013-08-22 14:28:55 +01:00
Mark Brown dc52399bdf Merge remote-tracking branch 'asoc/topic/txx9' into asoc-next 2013-08-22 14:28:55 +01:00
Mark Brown b7e8bbf29d Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-next 2013-08-22 14:28:54 +01:00
Mark Brown 3efdb7f685 Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-next 2013-08-22 14:28:53 +01:00
Mark Brown f9061f2fc1 Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-next 2013-08-22 14:28:53 +01:00
Mark Brown 2291d26914 Merge remote-tracking branch 'asoc/topic/tlv320aic26' into asoc-next 2013-08-22 14:28:52 +01:00
Mark Brown 840f0e4378 Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next 2013-08-22 14:28:52 +01:00
Mark Brown 049d41409d Merge remote-tracking branch 'asoc/topic/sta32x' into asoc-next 2013-08-22 14:28:51 +01:00
Mark Brown 8ef2292edb Merge remote-tracking branch 'asoc/topic/spdif' into asoc-next 2013-08-22 14:28:50 +01:00
Mark Brown 3090186057 Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next 2013-08-22 14:28:50 +01:00
Mark Brown d6abe0d5e7 Merge remote-tracking branch 'asoc/topic/sgtl5000' into asoc-next 2013-08-22 14:28:49 +01:00
Mark Brown c41788c091 Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next 2013-08-22 14:28:49 +01:00
Mark Brown 3f151cbf76 Merge remote-tracking branch 'asoc/topic/s6000' into asoc-next 2013-08-22 14:28:48 +01:00
Mark Brown 79916433f8 Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-next 2013-08-22 14:28:48 +01:00
Mark Brown b008387ab5 Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next 2013-08-22 14:28:47 +01:00
Mark Brown 5388d48047 Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next 2013-08-22 14:28:46 +01:00
Mark Brown 8a8b0e874a Merge remote-tracking branch 'asoc/topic/pcm3008' into asoc-next 2013-08-22 14:28:46 +01:00
Mark Brown 9e4fbee946 Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-next 2013-08-22 14:28:45 +01:00
Mark Brown fc30b93f83 Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-next 2013-08-22 14:28:45 +01:00
Mark Brown fe2a1e53be Merge remote-tracking branch 'asoc/topic/omap' into asoc-next 2013-08-22 14:28:44 +01:00
Mark Brown 49ffa3b1b2 Merge remote-tracking branch 'asoc/topic/nuc900' into asoc-next 2013-08-22 14:28:44 +01:00
Mark Brown c8a538417e Merge remote-tracking branch 'asoc/topic/new-pcm' into asoc-next 2013-08-22 14:28:43 +01:00
Mark Brown 97473630c7 Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next 2013-08-22 14:28:43 +01:00
Mark Brown 0995df3b63 Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-next 2013-08-22 14:28:42 +01:00
Mark Brown 6037fcad8e Merge remote-tracking branch 'asoc/topic/max9877' into asoc-next 2013-08-22 14:28:42 +01:00
Mark Brown 588701efbd Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next 2013-08-22 14:28:41 +01:00
Mark Brown ffdcb88b80 Merge remote-tracking branch 'asoc/topic/max9768' into asoc-next 2013-08-22 14:28:41 +01:00
Mark Brown a065050aa2 Merge remote-tracking branch 'asoc/topic/lm4857' into asoc-next 2013-08-22 14:28:40 +01:00
Mark Brown 54c1e27d8a Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-next 2013-08-22 14:28:39 +01:00
Mark Brown e6ddd8616c Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-next 2013-08-22 14:28:39 +01:00
Mark Brown 5bf83bf8f1 Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next 2013-08-22 14:28:38 +01:00
Mark Brown aef60a5029 Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-next 2013-08-22 14:28:38 +01:00
Mark Brown 7fc7d82fde Merge remote-tracking branch 'asoc/topic/dma' into asoc-next 2013-08-22 14:28:37 +01:00
Mark Brown 436f3562bb Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next 2013-08-22 14:28:32 +01:00
Mark Brown 7c24d7d67b Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next 2013-08-22 14:28:32 +01:00
Mark Brown ab8a4364ec Merge remote-tracking branch 'asoc/topic/cs4270' into asoc-next 2013-08-22 14:28:31 +01:00
Mark Brown 8157567013 Merge remote-tracking branch 'asoc/topic/core' into asoc-next 2013-08-22 14:28:31 +01:00
Mark Brown e7ac4fb607 Merge remote-tracking branch 'asoc/topic/compress' into asoc-next 2013-08-22 14:28:30 +01:00
Mark Brown b8e58d4e2e Merge remote-tracking branch 'asoc/topic/bt' into asoc-next 2013-08-22 14:28:30 +01:00
Mark Brown c4b481f493 Merge remote-tracking branch 'asoc/topic/blackfin' into asoc-next 2013-08-22 14:28:29 +01:00
Mark Brown a04a2aca4c Merge remote-tracking branch 'asoc/topic/au1x' into asoc-next 2013-08-22 14:28:29 +01:00
Mark Brown 04877397af Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next 2013-08-22 14:28:28 +01:00
Mark Brown 0b1107b29b Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next 2013-08-22 14:28:27 +01:00
Mark Brown 3e4ea1f989 Merge remote-tracking branch 'asoc/topic/ak5386' into asoc-next 2013-08-22 14:28:27 +01:00
Mark Brown e7dfdc1f1f Merge remote-tracking branch 'asoc/topic/ak4554' into asoc-next 2013-08-22 14:28:26 +01:00
Mark Brown de2e87ba76 Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-next 2013-08-22 14:28:25 +01:00
Mark Brown 6234eabf84 Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next 2013-08-22 14:28:25 +01:00
Mark Brown ece59528fa Merge remote-tracking branch 'asoc/topic/ads711x' into asoc-next 2013-08-22 14:28:24 +01:00
Mark Brown a9bd18201c Merge remote-tracking branch 'asoc/topic/adav80x' into asoc-next 2013-08-22 14:28:24 +01:00
Mark Brown e303c42da9 Merge remote-tracking branch 'asoc/topic/adau1701' into asoc-next 2013-08-22 14:28:23 +01:00
Mark Brown 042c325a5a Merge remote-tracking branch 'asoc/topic/ad73311' into asoc-next 2013-08-22 14:28:23 +01:00
Mark Brown f14c6f97c2 Merge remote-tracking branch 'asoc/topic/ad1980' into asoc-next 2013-08-22 14:28:22 +01:00
Mark Brown dfd18caaf6 Merge remote-tracking branch 'asoc/topic/ac97' into asoc-next 2013-08-22 14:28:22 +01:00
Mark Brown 10c0d7a9f9 Merge remote-tracking branch 'asoc/fix/wm8960' into asoc-linus 2013-08-22 14:28:21 +01:00
Tushar Behera 06b10ff913 ASoC: samsung: Fix build error with dma function rename
commit 85ff3c29d7 ("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>
2013-08-22 14:28:00 +01:00
Michael Grzeschik f037708654 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>
2013-08-22 11:11:20 +01:00
Michael Grzeschik 9b443e3d89 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>
2013-08-22 11:10:25 +01:00
Steffen Trumtrar f8fdf5375e 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>
2013-08-22 11:09:52 +01:00
Markus Pargmann cd7f0295aa 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>
2013-08-22 11:09:10 +01:00
Mark Brown 64393c6e64 Merge remote-tracking branch 'asoc/topic/ac97' into asoc-fsl 2013-08-22 11:09:03 +01:00
Nicolin Chen a2388a498a 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>
2013-08-22 10:45:22 +01:00
Sachin Kamat a1ce31388d 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>
2013-08-22 10:43:49 +01:00
Julia Lawall 673c24e957 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>
2013-08-20 11:50:58 +01:00
Fabio Estevam 0783e64898 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>
2013-08-20 11:47:04 +01:00
Markus Pargmann 741a509f34 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>
2013-08-20 11:02:00 +01:00
Mark Brown 85ff3c29d7 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>
2013-08-20 10:36:33 +01:00
Mark Brown 37e6071787 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>
2013-08-20 10:36:00 +01:00
Mark Brown 3c1c32d376 ASoC: imx: Add MODULE_LICENSE to DMA drivers
Reported-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-19 14:31:02 +01:00
Mark Brown fc60614865 ASoC: spdif: Remove duplicate const
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-19 12:20:53 +01:00
Mark Brown 2f6e3ba0e0 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>
2013-08-19 12:20:53 +01:00
Mark Brown 5195ca4902 ASoC: bt-sco: Provide stub DAPM integration
Ensure continued operation with DAPM being mandatory.

Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-19 12:20:26 +01:00
Mark Brown b9dff9c3d2 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>
2013-08-19 12:20:25 +01:00
Mark Brown c34e51b127 ASoC: hdmi: Provide stub DAPM integration
Ensure continued operation with DAPM being mandatory.

Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-19 12:19:02 +01:00
Mark Brown d2a369cb53 ASoC: ac97: Provide stub DAPM integration
Ensure continued operation with DAPM being mandatory.

Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-19 12:18:40 +01:00
Mark Brown c5efb38a13 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>
2013-08-19 11:12:09 +01:00
Mark Brown 66e7aa22c7 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>
2013-08-19 11:12:09 +01:00
Mark Brown 3efd8a6f1a 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>
2013-08-19 11:12:08 +01:00
Mark Brown 226059e1cd 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>
2013-08-18 18:39:49 +01:00
Mark Brown 72a061f763 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>
2013-08-18 18:39:27 +01:00
Mark Brown 782fbaba36 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>
2013-08-18 18:27:40 +01:00
Mark Brown e29deb4818 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>
2013-08-18 18:27:08 +01:00
Mark Brown 4fc932c6d8 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>
2013-08-18 16:40:01 +01:00
Mark Brown faaf36f216 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>
2013-08-18 16:40:00 +01:00
Mark Brown ea67afc3fd 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>
2013-08-18 16:40:00 +01:00
Mike Dyer 85fa532b6e 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
2013-08-18 16:30:26 +01:00
Fabio Estevam 70a39b930f 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>
2013-08-18 16:28:47 +01:00
Mark Brown ac0b82b178 ASoC: si476x: Add DAPM support
This ensures the driver continues to work with DAPM mandatory and makes
it easier to connect the device up to other components in the subsystem.

Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Andrey Smirnov <andrew.smirnov@gmail.com>
2013-08-18 16:27:48 +01:00
Mark Brown 4a11bc2fdd ASoC: tlv320aic26: Add basic DAPM support
Provide external widgets for the CODEC to ensure the device continues to
function with DAPM mandatory and to make it easier to hook the device up
to other components.

Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-16 12:32:44 +01:00
Mark Brown c21bb9b1b7 ASoC: tlv320aic26: Remove noisy print
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-16 12:32:43 +01:00