summaryrefslogtreecommitdiffstats
path: root/sound
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'asoc-3.6' of ↵Takashi Iwai2012-07-19113-1339/+16392
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next ASoC: Updates for 3.6 This has been a pretty quiet release - very little activity in framework terms, mostly just a few new drivers and updates: - Added the ability to add and remove DAPM paths dynamically, mostly for reparenting on clock changes. - New machine drivers for Marvell Brownstone, ST-Ericsson Ux500 reference platform and ttc-dkp. - New CPU drivers for Blackfin BF6xx SPORTs in I2S mode, Marvell MMP, Synopsis Designware I2S controllers, and SPEAr DMA and S/PDIF - New CODEC drivers for Dialog DA732x, ST STA529, ST-Ericsson AB8500, TI Isabelle and Wolfson Microelectronics WM5102 and WM5110
| * ASoC imx-audmux: add MX31_AUDMUX_PORT7_SSI_PINS_7 defineTorben Hohn2012-07-182-1/+2
| | | | | | | | | | | | | | | | | | The MX31 Audmux also has 7 Ports. This patch adds the missing define, and makes the debugfs code iterate over that port too. Signed-off-by: Torben Hohn <torbenh@linutronix.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: littlemill: Add userspace control of the WM1250 I/OMark Brown2012-07-181-0/+7
| | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: wm8994: Update micdet for irqdomain conversionMark Brown2012-07-181-3/+4
| | | | | | | | | | | | | | | | The conversion of the core driver to irqdomains means that we don't need and irq_base to have working interrupts so use wm8994_request_irq() to deal with looking up the interrupt number for the micdet IRQ. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: Convert S3C2412 I2S driver to gpiolib APISylwester Nawrocki2012-07-151-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The s3c2410_gpio* calls are obsolete and have been scheduled for removal since several kernel releases. Remove them and use common gpiolib API. This patch is a prerequisite for removal of the obsolete S3C24XX SoC GPIO definitions. Compile tested only. Cc: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: Convert S3C24XX I2S driver to gpiolib APISylwester Nawrocki2012-07-151-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The s3c2410_gpio* calls are obsolete and have been scheduled for removal since several kernel releases. Remove them and use common gpiolib API. This patch is a prerequisite for removal of the obsolete S3C24XX SoC GPIO definitions. Tested on Micro2440-SDK. Cc: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: dapm: Fix compilation warningMarek Belisko2012-07-131-0/+1
| | | | | | | | | | | | | | | | | | Fix following: sound/soc/soc-dapm.c: In function ‘dapm_clock_event’: sound/soc/soc-dapm.c:1021:1: warning: control reaches end of non-void function [-Wreturn-type] Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: wm8962: Redo early init of the part on resumeMark Brown2012-07-121-0/+3
| | | | | | | | | | | | | | | | | | Ensure robust startup of the part by going through the reset procedure prior to resyncing the full register cache, avoiding potential intermittent faults in some designs. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@vger.kernel.org
| * ASoC: Free memory in the error paths of soc_of_parse_audio_routing()Matthias Kaehlcke2012-07-111-0/+2
| | | | | | | | | | | | | | | | Release the memory of the routing table before leaving the function upon errors in the device tree Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: wm5110: Add audio CODEC driverMark Brown2012-07-114-0/+979
| | | | | | | | | | | | | | | | | | | | | | The WM5110 is a highly integrated low power audio subsystem for smartphones, tablets and other portable audio devices. It combines an advanced DSP feature set with a flexible, high performance audio hub CODEC. This patch adds the audio CODEC driver for the device. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: STA529: fix an error messageDan Carpenter2012-07-111-1/+2
| | | | | | | | | | | | | | | | GCC complains that "ret" is uninitialized here. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-By: Rajeev Kumar <rajeev-dlh.kumar@st.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: arizona: Support variable FLL VCO multipliersMark Brown2012-07-103-3/+7
| | | | | | | | | | | | | | Some Arizona chips have a higher frequency for the FLL VCO, support this in the common code. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: tlv320aic3x: add input clock selectionJiri Prchal2012-07-102-0/+14
| | | | | | | | | | | | | | | | This patch adds input selection of main codec clock - from what pin. Both registers set same value since codec uses clock divider or pll at one time. Signed-off-by: Jiri Prchal <jiri.prchal@aksignal.cz> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: tlv320aic3x: add AGC settingsJiri Prchal2012-07-101-0/+25
| | | | | | | | | | | | | | | | This patch adds AGC target level and times settings for TLV320AIC3x. Enums uses small arrays of two channels left and right since it uses different registers. Signed-off-by: Jiri Prchal <jiri.prchal@aksignal.cz> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: tlv320aic3x: add deemphasis switchJiri Prchal2012-07-091-0/+3
| | | | | | | | | | | | | | This patch adds missing deemphasis switch. Signed-off-by: Jiri Prchal <jiri.prchal@aksignal.cz> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: wm5102: Fix cut'n'paste for digital volume registersMark Brown2012-07-091-3/+3
| | | | | | | | | | | | | | The analogue PGA shifts were used; this makes no practical difference as the values are the same. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: arizona: Add IN4 to the mixer tablesMark Brown2012-07-092-1/+5
| | | | | | | | | | | | Some devices have four input structures rather than three. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: arizona: Export dai_opsMark Brown2012-07-091-0/+1
| | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: arizona: Change DAPM routes for AIF clocks when we change themMark Brown2012-07-061-3/+29
| | | | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
| * ASoC: dapm: Allow routes to be deleted at runtimeMark Brown2012-07-061-0/+77
| | | | | | | | | | | | | | | | | | | | Since we're now relying on DAPM for things like enabling clocks when we reparent the clocks for widgets we need to either use conditional routes (which are expensive) or remove routes at runtime. Add a route removal API to support this use case. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
| * ASoC: dapm: Mark widgets as dirty when a route is addedMark Brown2012-07-061-0/+4
| | | | | | | | | | | | | | | | If we add a new route at runtime then we'll need to recheck the connections to the affected widgets. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
| * ASoC: dpcm: Allow FE to be opened without valid BE routes.Liam Girdwood2012-07-061-3/+1
| | | | | | | | | | | | | | | | | | Some userspace will open a PCM device and then configure mixers for routing before triggering. This patch allows userspace to do this sequence. Signed-off-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: twl6040: fix spelling mistakeSimon Wilson2012-07-061-1/+1
| | | | | | | | | | | | | | | | Fix spelling mistake in "High-Performance" option of twl6040 power mode. Signed-off-by: Simon Wilson <simonwilson@google.com> Signed-off-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: pcm: Clean up logging in soc_new_pcm()Liam Girdwood2012-07-061-4/+4
| | | | | | | | | | | | | | Use dev_ style logging throughout soc_new_pcm() Signed-off-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: wm1250-ev1: Flag all supported rates in the DAIMark Brown2012-07-051-2/+5
| | | | | | | | | | | | Not previously noticed due to normal usage being with CODEC<->CODEC links. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: wm5102: Allow routing through the ASRCsMark Brown2012-07-051-1/+29
| | | | | | | | | | | | This enables common telephony use cases. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: arizona: Enable ASYNCCLK domain for audio interfacesMark Brown2012-07-051-6/+24
| | | | | | | | | | | | | | If an audio interface is configured to use ASYNCCLK then update the asynchronous sample rate rather than one of our primary sample rates. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: imx-mc13783: Add audmux settings for mx27pdkFabio Estevam2012-07-051-16/+33
| | | | | | | | | | | | | | | | | | | | mx27pdk board also has a mc13783 codec. Add support for it and do a run-time machine type check to perform the correct audiomux settings. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: fsl: remove unneeded AUDMUX register setting from imx-sgtl5000Hui Wang2012-07-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | If we don't set IMX_AUDMUX_V2_PTCR_TCLKDIR in the AUDMUX PTCR register (means Tx clock pin is input), we don't need to set IMX_AUDMUX_V2_PTCR_TCSEL as well. Since both i.MX35, i.MX51 and i.MX6 datasheet says "When Tx clock pin set as an input, the TCSEL settings are ignored". Signed-off-by: Hui Wang <jason77.wang@gmail.com> Acked-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: arizona: Be more forgiving in BCLK selectionMark Brown2012-07-041-1/+2
| | | | | | | | | | | | | | Allow any BCLK which can be divided down to generate LRCLK, not just the lowest possible BCLK to clock out the samples. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: arizona: Implement AIF clock configurationMark Brown2012-07-043-0/+118
| | | | | | | | | | | | | | | | Allow the user to select which of the system clocks each AIF is referenced to and constran the DAI to the set of frequencies which can be generated from that clock. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: arizona: Rename current rates tables to bclk_ratesMark Brown2012-07-041-6/+6
| | | | | | | | | | | | | | They're the rates for the BCLK, not for the sample rate, so rename so that we don't confuse ourselves. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: dwc: Staticise non-exported i2s_start()Mark Brown2012-07-041-1/+2
| | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: SPEAr spdif_out: Add spdif out supportVipin Kumar2012-07-042-0/+468
| | | | | | | | | | | | | | | | | | This patch implements the spdif out driver for ST peripheral. This peripheral implements IEC60958 standard Signed-off-by: Vipin Kumar <vipin.kumar@st.com> Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: STA529: Add support for STA529 Audio CodecRajeev Kumar2012-07-043-0/+447
| | | | | | | | | | | | | | | | | | | | The STA529 is a digital stereo class-D audio amplifier. It includes an audio DSP, an ST proprietary high-efficiency class-D driver and CMOS power output stage. It is intended for high-efficiency digital-to-power-audio conversion for portable applications. Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: tlv320aic3x: extending registers cacheJiri Prchal2012-07-041-1/+3
| | | | | | | | | | | | | | Adds missing register default values to cache. Signed-off-by: Jiri Prchal <jiri.prchal@aksignal.cz> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: tlv320aic3x: add missing registers and bitsJiri Prchal2012-07-041-1/+18
| | | | | | | | | | | | | | | | Adds register and bit shift definitions in header file. Changes are for TLV320AIC310x based on data sheet. Signed-off-by: Jiri Prchal <jiri.prchal@aksignal.cz> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: wm8994: Don't suspend accessory detectionMark Brown2012-07-031-37/+0
| | | | | | | | | | | | | | | | Leave it up to the machine driver to disable accessory detection if desired, the common pattern is to have accessory detection be a wake source. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: core: Try to use regmap if the driver doesn't set up any I/OMark Brown2012-07-031-0/+4
| | | | | | | | | | | | | | | | | | | | Since most new drivers are expected to use regmap and since frequently the only thing we need to do in the CODEC probe function is configure the I/O try to initialise the register I/O using regmap if the driver hasn't done so after probe(). Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
| * ASoC: wm8962: Log AIF configuration requested by hw_params()Mark Brown2012-07-031-0/+3
| | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: tegra: use dmaengine based dma driverLaxman Dewangan2012-07-033-1/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the dmaengine based Tegra APB DMA driver for data transfer between SPI fifo and memory in place of legacy Tegra APB DMA. Because generic soc-dmaengine-pcm uses the DMAs API based on dmaengine, using the exported APIs provided by this generic driver. The new driver is selected if legacy driver is not selected and new dma driver is enabled through config file. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Acked-by: Stephen Warren <swarren@wwwdotorg.org> Tested-by: Stephen Warren <swarren@wwwdotorg.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: dapm: Remove incomplete stereo codeBenoît Thébaudeau2012-07-031-10/+12
| | | | | | | | | | | | | | | | Stereo is not yet supported by dapm widgets, so remove stereo code from snd_soc_dapm_get_volsw(), and warn if stereo controls are detected. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: smdk_wm8994: Convert to use snd_soc_register_card()Sachin Kamat2012-07-031-13/+23
| | | | | | | | | | | | | | | | | | Current method for machine driver to register with the ASoC core is to use snd_soc_register_card() instead of creating a "soc-audio" platform device. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Acked-by: Sangbeom Kim <sbkim73@samsung.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: dapm: Fix snd_soc_dapm_put_volsw() connectBenoît Thébaudeau2012-06-291-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | snd_soc_dapm_put_volsw() sets connect incorrectly in the case max > 1 with invert. In that case, the raw disconnect value should be max, which corresponds to the userspace value 0. This use case currently does not appear upstream, but it could break SOC_DAPM_SINGLE() or SOC_DAPM_SINGLE_TLV() elsewhere or in the future. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: spdif: Build separate RX and TX objectsMark Brown2012-06-291-2/+3
| | | | | | | | | | | | | | | | Otherwise we fail to link when building as modules due to multiple init/exit functions. Reported-by: Fengguang Wu <wfg@linux.intel.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: spdif_receiver: Add support for spdif in Audio CodecVipin Kumar2012-06-282-1/+68
| | | | | | | | | | | | | | | | This patch adds the support for spdif in audio codec. Signed-off-by: vipin Kumar <vipin.kumar@st.com> Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: dwc: Add missing __iomem annotationsMark Brown2012-06-281-2/+2
| | | | | | | | | | | | Otherwise sparse gets very upset with us. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: wm5102: Remove unused platform data headerMark Brown2012-06-271-1/+0
| | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: dwc: Bodge around continuing absence of clock API stubsMark Brown2012-06-251-0/+1
| | | | | | | | | | | | | | | | | | The patches for stubbing out the generic clock API still haven't been applied so we need to either add ifdefs here or add a dependency until someone decides to actually apply them. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: wm8996: Move register default configuration to I2C probeMark Brown2012-06-251-151/+180
| | | | | | | | | | | | | | This gets the registers set up as early as possible, mainly useful for the GPIOs to ensure that they're in the correct mode. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
OpenPOWER on IntegriCloud