summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream/wm8350' into for-2.6.32Mark Brown2009-10-061-2/+2
|\
| * ASoC: WM8350 capture PGA mutes are invertedMark Brown2009-10-061-2/+2
| | | | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@kernel.org
* | Merge branch 'for-2.6.32' of ↵Mark Brown2009-10-061-1/+1
|\ \ | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.32
| * | ASoC: wm8940: Fix check on error code form snd_soc_codec_set_cache_ioJonathan Cameron2009-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix for typo in commit 8d50e447d19fec64adebeef55f2b60d695435412 ASoC: Factor out I/O for Wolfson 8 bit data 16 bit register CODECs Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | Merge branch 'fix/asoc' of ↵Linus Torvalds2009-09-233-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ASoC: wm8753: fix mapping when MONOMIX is set to Stereo ASoC: some minor changes for AD1836 and AD1938 codec drivers ASoC: DaVinci: Fixes to McASP configuration ASoC: Blackfin I2S: fix resuming when device hasn't been used ASoC: Blackfin I2S: add lost platform_device parameter to resume function ASoC: fix typos in Blackfin headers ASoC: bf5xx-sport: the irq save/restore funcs take an unsigned long ASoC: Blackfin AC97: add a few missing multichannel define handling
| * | ASoC: wm8753: fix mapping when MONOMIX is set to StereoPhil Vandry2009-09-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | When MONOMIX is set to Stereo, Left PGA was not powered on but should be. Add a mapping from Capture Left Mux to Capture Left Mixer to fix the issue. Signed-off-by: Phil Vandry <vandry@TZoNE.ORG> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: some minor changes for AD1836 and AD1938 codec driversBarry Song2009-09-212-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 1. delete redundant assignment to bus field in spi_driver structure 2. fix lost assignment to set_bias_level entry in ad1938 codec dai 3. change spi driver name of ad1836 from "ad1836-spi" to "ad1836" Signed-off-by: Barry Song <barry.song@analog.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | trivial: remove unnecessary semicolonsJoe Perches2009-09-211-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | | Merge branch 'fix/asoc' into for-linusTakashi Iwai2009-09-173-3/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * fix/asoc: ASoC: remove unused #include <linux/version.h> ASoC: S3C lrsync function made to work with IRQs disabled. ASoC: Fix display of stream name in DAPM debugfs ASoC: Clean up error handling in MPC5200 DMA setup
| * | ASoC: remove unused #include <linux/version.h>Huang Weiyi2009-09-163-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused #include <linux/version.h>('s) in sound/soc/codecs/ad1836.c sound/soc/codecs/ad1938.c sound/soc/codecs/wm8974.c Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | Merge branch 'topic/asoc' into for-linusTakashi Iwai2009-09-1052-1988/+13704
|\| | | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * topic/asoc: (226 commits) ASoC: au1x: PSC-AC97 bugfixes ASoC: Fix WM835x Out4 capture enumeration ASoC: Remove unuused hw_read_t ASoC: fix pxa2xx-ac97.c breakage ASoC: Fully specify DC servo bits to update in wm_hubs ASoC: Debugged improper setting of PLL fields in WM8580 driver ASoC: new board driver to connect bfin-5xx with ad1836 codec ASoC: OMAP: Add functionality to set CLKR and FSR sources in McBSP DAI ASoC: davinci: i2c device creation moved into board files ASoC: Don't reconfigure WM8350 FLL if not needed ASoC: Fix s3c-i2s-v2 build ASoC: Make platform data optional for TLV320AIC3x ASoC: Add S3C24xx dependencies for Simtec machines ASoC: SDP3430: Fix TWL GPIO6 pin mux request ASoC: S3C platform: Fix s3c2410_dma_started() called at improper time ARM: OMAP: McBSP: Merge two functions into omap_mcbsp_start/_stop ASoC: OMAP: Fix setup of XCCR and RCCR registers in McBSP DAI OMAP: McBSP: Use textual values in DMA operating mode sysfs files ARM: OMAP: DMA: Add support for DMA channel self linking on OMAP1510 ASoC: Select core DMA when building for S3C64xx ...
| * ASoC: Fix WM835x Out4 capture enumerationMark Brown2009-09-071-1/+1
| | | | | | | | | | | | | | | | It's the 8th enum of a zero indexed array. This is why I don't let new drivers use these arrays of enums... Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@kernel.org
| * ASoC: Fully specify DC servo bits to update in wm_hubsMark Brown2009-09-021-10/+2
| | | | | | | | | | | | | | Avoids potential issues if we read back unexpected values during a read/modify/write cycle. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: Debugged improper setting of PLL fields in WM8580 driverjassi brar2009-09-011-2/+2
| | | | | | | | | | | | | | | | | | | | Bug was caught while trying to use WM8580 as I2S master on SMDK. Symptoms were lesser LRCLK read by CRO(41.02 instead of 44.1 KHz) Solved by referring to WM8580A manual and setting mask value correctly and making the code to not touch 'reserved' bits of PLL4 register. Signed-off-by: Jassi <jassi.brar@samsung.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: Don't reconfigure WM8350 FLL if not neededMark Brown2009-08-261-0/+9
| | | | | | | | | | | | | | If the requested FLL configuration is the one we're currently running in it's at best pointless to reconfigure the FLL. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: Make platform data optional for TLV320AIC3xMark Brown2009-08-261-7/+6
| | | | | | | | | | | | | | | | Now that we don't need the I2C address for the device the platform data is redundant so allow it to be omitted. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Tested-by: Chaithrika U S <chaithrika@ti.com>
| * Merge branch 'topic/digital-mixing' into for-2.6.32Mark Brown2009-08-241-4/+84
| |\
| | * ASoC: WM8993 digital mixing supportMark Brown2009-08-181-4/+84
| | | | | | | | | | | | | | | | | | | | | | | | The WM8993 provides digital sidetone paths and also allows each channel on the audio interface to be routed separtately to the DACs and ADCs. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: Remove unneeded inclusion of linux/regulator/consumer.hTakashi Iwai2009-08-241-1/+0
| | | | | | | | | | | | Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ASoC: free socdev if init_card() fails in wm9705_soc_probe()Roel Kluin2009-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | Free socdev if snd_soc_init_card() fails. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: Add ak4642/ak4643 codec supportKuninori Morimoto2009-08-214-0/+528
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is very simple driver for ALSA It supprt headphone output and stereo input only This patch is tested by ms7724se Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: tlv320aic3x: Change to use device modelBen Dooks2009-08-212-107/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tlv320aic3x driver managed its own i2c device, instead of an extant one created by the board support code. Change the code to make it so that the driver binds to an extant (in this case i2c) device. Add explict tlv320aic33 as well as tlv320aic3x to the supported device table and remove the old driver bindings from the users of this code. Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: Remove duplicate ADC/DAC widgets from wm_hubs.cMark Brown2009-08-181-6/+0
| | | | | | | | | | | | | | | | | | | | | These need to be in the CODEC since the DAIs supported by the CODECs aren't static. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: Implement TDM configuration for WM8993Mark Brown2009-08-171-18/+81
| | | | | | | | | | | | | | | | | | | | | Note that the number of slots used internally is specified in terms of stereo slots while the external API works with mono slots. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: Fix WM8993 MCLK configuration for high frequency MCLKsMark Brown2009-08-171-3/+1
| |/ | | | | | | | | | | | | | | When used without the PLL we were accidentally clearing the MCLK/2 divider, resulting in a double rate SYSCLK when the divider should have been used. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: UDA134X: Fix mistaken mute/unmute codeShine Liu2009-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | There is a mistake in current uda134x_mute function: mute_reg has been changed in line 162 or line 164, so uda134x_write should write "mute_reg" but not "mute_reg & ~(1<<2)" to UDA134X_DATA010. Signed-off-by: Shine Liu <shinel@foxmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: Factor out cache I/O from WM8974Mark Brown2009-08-151-94/+55
| | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * Merge branch 'wm8974-upstream' into for-2.6.32Mark Brown2009-08-154-0/+952
| |\
| | * ASoC: Correct a bug with "ADC Inversion Switch" in wm8974 codec.javier Martin2009-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | This corrects a bug with ADC Inversion Switch in wm8974 codec. Signed-off-by: Javier Martin <javier.martin@vista-silicon.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| | * ASoC: WM8974 DAPM cleanupsMark Brown2009-06-301-38/+37
| | | | | | | | | | | | | | | | | | Also implement AUX mode control. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| | * ASoC: WM8974 cosmetic cleanupsMark Brown2009-06-301-3/+4
| | | | | | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| | * ASoC: Use symmetric rates for WM8974Mark Brown2009-06-301-0/+1
| | | | | | | | | | | | | | | | | | The chip has a single LRCLK. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| | * ASoC: Add WM8974 TLV informationMark Brown2009-06-301-9/+15
| | | | | | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| | * ASoC: Refresh WM8974 PLL configurationMark Brown2009-06-301-27/+60
| | | | | | | | | | | | | | | | | | Move away from a fixed table to runtime calculation. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| | * ASoC: Declare 2 channels for WM8974Mark Brown2009-06-301-2/+2
| | | | | | | | | | | | | | | | | | | | | The device is a mono device but it can read two channel data and many I2S controllers only understand 2 channels. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| | * ASoC: Refresh WM8974 bias configurationMark Brown2009-06-301-7/+23
| | | | | | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| | * ASoC: Remove unreferenced wm8974_add_controls()Mark Brown2009-06-291-16/+0
| | | | | | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| | * ASoC: Update WM8974 to use standard I2C device probe methodsMark Brown2009-05-232-156/+116
| | | | | | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| | * ASoC: WM8974 checkpatch cleanupsMark Brown2009-05-232-54/+52
| | | | | | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| | * ASoC: Add WM8974 CODEC driverMark Brown2009-05-234-0/+954
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The WM8974 is a low power, high quality mono CODEC designed for portable applications such as digital still cameras or digital voice recorders. This driver was originally written by Graeme Gregory and Liam Girdwood and has since been maintained by myself with some updates contributed by Brett Saunders and Javier Martin. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: delete -spi suffix in ad1938 and free private data while registers failBarry Song2009-08-141-1/+3
| | | | | | | | | | | | | | | Signed-off-by: Barry Song <21cnbao@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: TWL4030: Fix for capture mixer stringsPeter Ujfalusi2009-08-141-21/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change the strings related to capture in order to be interpreted correctly by alsamixer and possible other UI based mixer applications. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: Factor out shared code from WM8993Mark Brown2009-08-135-694/+810
| | | | | | | | | | | | | | | | | | | | | | | | | | | The WM8993 analogue control is shared with other devices in the same product line. Since this is a very substantial proportion of the driver move the definitions of these controls into a new wm_hubs module which allows them to be shared between the two. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: Minor cleanups to AD1938 driverMark Brown2009-08-132-5/+1
| | | | | | | | | | | | | | | | | | | | | - Build in SND_SOC_ALL_CODECS. - Remove null suspend/resume stuff. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | new ad1836 codec driver based on asocBarry Song2009-08-134-0/+520
| | | | | | | | | | | | | | | | | | | | | | | | | | | There has been an ad1836 driver in sound/blackfin based on traditional alsa. The new driver is based on asoc. The architecture of ad1836 codec driver is very much like ad1938. Signed-off-by: Barry Song <21cnbao@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: TWL4030: Introduce PGAs for outputsPeter Ujfalusi2009-08-131-49/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dynamically control and control only the needed output amplifier muting/un-muting. The original code was muting and un-muting the following output amplifiers: Earpiece PreDrivL/R, CarkitL/R at the same time regardless which pin is actually in use at the given moment. Move these as separate PGA so only the needed amplifier will be touched. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: add output/input widgets in ad1938 to make dac/adc dynamic PM workBarry Song2009-08-131-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the function dapm_dac_check_power() in sound/soc/soc-dapm.c, dac power can't be on/off stand-alone without any output widget as sink. And according to dapm_adc_check_power(), adc power can't be on/off stand-alone without any input widget as source. So we can't only define some stand-alone SND_SOC_DAPM_DAC/SND_SOC_DAPM_ADC to hope their power can be managed dynamically. Signed-off-by: Barry Song <21cnbao@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: Update AD1938 for new TDM slot APIMark Brown2009-08-121-2/+2
| | | | | | | | | | | | | | | | | | It's only actually paying attention to the slot count anyway. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: Update WM9081 for tdm_slot() API changeMark Brown2009-08-111-25/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store the TDM slot width then if it's set use that rather than the sample size to calculate BCLK. Leave imposing constraints to the core (which should do this but doesn't yet) or machine driver. Also allow 0 TDM slots to be configure (for use when disabling TDM). Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | Merge commit 'a5479e389e989acfeca9c32eeb0083d086202280' into for-2.6.32Mark Brown2009-08-111-2/+3
| |\ \