summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-12-09Merge remote-tracking branch 'asoc/topic/fsi' into asoc-nextMark Brown2-69/+487
2012-12-09Merge remote-tracking branch 'asoc/topic/dmaengine' into asoc-nextMark Brown1-0/+2
2012-12-09Merge remote-tracking branch 'asoc/topic/davinci' into asoc-nextMark Brown7-97/+158
2012-12-09Merge remote-tracking branch 'asoc/topic/da9055' into asoc-nextMark Brown1-13/+30
2012-12-09Merge remote-tracking branch 'asoc/topic/da7210' into asoc-nextMark Brown1-21/+3
2012-12-09Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-nextMark Brown3-3/+21
2012-12-09Merge remote-tracking branch 'asoc/topic/atmel' into asoc-nextMark Brown32-611/+1108
2012-12-09Merge remote-tracking branch 'asoc/topic/arizona' into asoc-nextMark Brown12-58/+586
2012-12-09Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-nextMark Brown1-21/+2
2012-12-09Merge remote-tracking branch 'asoc/topic/ak4535' into asoc-nextMark Brown1-6/+1
2012-12-09Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-nextMark Brown2-17/+70
2012-12-09Merge remote-tracking branch 'asoc/topic/adsp' into asoc-nextMark Brown6-33/+1461
2012-12-09Merge remote-tracking branch 'asoc/topic/ab8500' into asoc-nextMark Brown1-1/+1
2012-12-09Merge remote-tracking branch 'asoc/fix/omap' into asoc-nextMark Brown6-17/+13
2012-12-09ASoC: wm5110: Enable volume ramp controlMark Brown1-0/+6
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-09ASoC: wm5102: Enable volume ramp controlMark Brown1-0/+6
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-09ASoC: arizona: Add volume ramp controlsMark Brown2-0/+31
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-07ASoC: McASP: implement a way to force BCLK/LRCLK ratiosDaniel Mack2-0/+16
Depending on the Codec, the the BCLK/LRCLK ratio might not be freely chosen by the CPU DAI. For example, some Codec might want to be supplied with 32-bit samples for both its channels regardless of the actual audio word size the CPU sends. In such cases, the rest of the bits on the data lines must be padded with zeros: _______________________________ LRCLK / \ --' `---------- ..... BCLK ||||||||||||||||||||||||||||||||||||||||||||||| ..... DATA ____||||||||||||||||_________________|||||||||| ..... |<-- data -->|<-- pads --> | This patch adds a new clock divider to configure the BCLK/LRCLK ratio. If the machine code uses that divider, the driver uses the specified value, instead of deriving that information from the audio word size. Otherwise, the original behaviour is retained. Signed-off-by: Daniel Mack <zonque@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-07ASoC: McASP: calculate values for channel sizeDaniel Mack2-63/+10
Change davinci_config_channel_size() to derive the values for XSSZ and XROT in DAVINCI_MCASP_[RT]XFMT_REG from the configured word length rather than hard-coding them in a switch/case block. Also, by directly passing the word length to davinci_config_channel_size(), we can get rid of the DAVINCI_AUDIO_WORD_* enum. Signed-off-by: Daniel Mack <zonque@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-07ASoC: McASP: remove unused variablesDaniel Mack3-4/+0
codec_fmt and sample_rate variables are unused in both snd_platform_data and davinci_audio_dev, so drop them. Signed-off-by: Daniel Mack <zonque@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-07ASoC: arizona: Log the clock we're setting the DAI to useMark Brown1-0/+3
Useful for diagnostics. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-07ASoC: arizona: Store the DAI clock ID when settingMark Brown1-0/+2
So the code to suppress duplicate changes is effective. Reported-by: Kyung Kwee Ryu <Kyung-Kwee.Ryu@wolfsonmicro.comyu@wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-06ASoC: arizona: Make FLL lock timeout very highMark Brown1-1/+1
Provide robustness against low quality FLL sync clocks by increasing the timeout for lock to an absurdly high point; we should never get anywhere near hitting the timeout in a real system unless it is failing. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-05ASoC: wm5110: Add LHPF coefficient configurationMark Brown1-0/+5
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-05ASoC: wm5110: Add EQ coefficient configurationMark Brown1-0/+9
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-05ASoC: wm5102: Make EQ coefficents configurableMark Brown1-0/+9
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-03ASoC: zoom2: Remove HS mux GPIO handling to avoid kernel crash due to BUG_ON()Peter Ujfalusi1-7/+0
The machine driver try to use GPIO15 of twl4030 for HS MUX which supposed to select between TWL's HSOL/R and tlv320aic3254's HPL/R. The TWL's GPIO allocated dynamically so the (OMAP_MAX_GPIO_LINES + 15) is no longer valid GPIO number causing a kernel crash due to BUG_ON() Also the current machine driver supports only TWL audio currently: there is no need to control the GPIO. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-03ASoC: da7210: Remove unnecessary regmap_exit callSachin Kamat1-10/+1
Use of devm_regmap_init_spi does not require an explicit regmap_exit call. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-03ASoC: wm5102: Add support for configuring LHPF coefficientsMark Brown1-0/+5
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-02ASoC: adsp: Set DSP clock rate to SYSCLK rateMark Brown1-0/+22
For simplicity always run the DSP at the SYSCLK rate. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-02ASoC: adsp: Keep ADSP2 memory powered off when not in useMark Brown1-0/+11
Turn off the ADSP memory when we aren't using it, saving a small amount of power. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-02ASoC: atmel-pcm: dma support based on pcm dmaengineBo Shen5-2/+276
Specify overrun bit in interrupt mask Add dmaengine specific routines Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> [voice.shen@atmel.com: adapt to soc dmaengine framework] Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-02ASoC: atmel-pcm: split into two fileBo Shen6-382/+441
This patch is split original atmel-pcm.c into new atmel-pcm.c and atmel-pcm-pdc.c two files. The new atmel-pcm.c is the share routine while will be used for pdc or dma transfer. Using SND_ATMEL_SOC_PDC to select using PDC for audio transfer Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-02ASoC: wm5102: Correct base address for Y regionMark Brown1-1/+1
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-29ASoC: arizona: Add parenthesesMark Brown1-1/+1
Some compiler versions complain. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-29ASoC: wm_adsp: Set the core enable as well as start bit for ADSP2Mark Brown1-3/+5
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28ASoC: omap-abe-twl6040: Use "ti,jack-detection" DT property as booleanPeter Ujfalusi2-4/+4
Handle the jack detection inforamtion as bool from devicetree. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28ASoC: wm5102: Enable DVFS support for the DSPMark Brown1-1/+5
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28Merge branch 'topic/adsp' of ↵Mark Brown2-2/+100
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-arizona
2012-11-28ASoC: da7210: Use devm_regmap_init_i2c()Sachin Kamat1-11/+2
devm_regmap_init_i2c() is device managed and makes error handling and code cleanup simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28ASoC: ak4535: Use devm_regmap_init_i2c()Sachin Kamat1-6/+1
devm_regmap_init_i2c() is device managed and makes error handling and code cleanup simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28ASoC: wm_adsp: Enable DVFS for ADSP2Mark Brown2-2/+100
Some ADSP devices can make use of DVFS to optimise power consumption depending on the operating frequency of the DSP core. Implement support for this in the generic ADSP code. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28mfd: arizona: Register haptics devicesMark Brown1-0/+2
Both WM5102 and WM5110 support haptics, register the device. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28ASoC: wm5110: Implement haptics supportMark Brown1-1/+24
Provide a haptics widget for use by the haptics driver and expose the DAPM context for it. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28ASoC: wm5102: Implement haptics supportMark Brown1-1/+23
Provide a haptics widget for use by the haptics driver and expose the DAPM context for it. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28Input - arizona-haptics: Add driver haptics module on Arizona CODECsMark Brown4-0/+272
The Arizona CODECs contain a haptics module providing vibration feedback support. Implement basic support for this, providing simple start/stop and signal magnitude control. Since the output path for haptics is routed through the CODEC audio routing it is modelled as a signal generator within ASoC, the haptics driver calls DAPM to start and stop the output drivers. An appropriate output path must be configured via ALSA to connect the haptics source to the correct output. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28mfd: arizona: Allow the CODEC DAPM context to be accessed elsewhereMark Brown1-0/+4
Some other device functions need to integrate with signal sources in the audio portion (primarily for haptics) so allow CODEC to export the DAPM context by pointing to it from the core driver. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28ASoC: arizona: Record FLL setting when disablingMark Brown1-0/+3
Otherwise we skip reenables. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-27ASoC: OMAP: mcbsp fixes for enabling ARM multiplatform supportTony Lindgren3-6/+9
We cannot include any plat or mach headers for the multiplatform support. Fix the issue by defining local mcbsp_omap1(). Signed-off-by: Tony Lindgren <tony@atomide.com> Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-27ASoC: fsl: fix miscompilation of snd-soc-imx-pcmLothar Waßmann1-2/+2
Hi Mark, thanks your insisting on a better description for the patch, I found a more appropriate solution for the problem: Compiling the SoC Audio driver for Freescale i.MX as a module (CONFIG_SND_SOC_IMX_PCM=m) results in a non-functional sound driver indicated by the error message: | imx-sgtl5000 sound.1: platform imx-pcm-audio not registered | imx-sgtl5000 sound.1: snd_soc_register_card failed (-517) | platform sound.1: Driver imx-sgtl5000 requests probe deferral instead of the message: | imx-sgtl5000 sound.1: sgtl5000 <-> 63fcc000.ssi mapping ok that is to be expected upon loading the snd-soc-imx-pcm.ko module. The build log reveals, that the file imx-pcm-dma.o (or imx-pcm-fiq.o depending on the kernel configuration), which should be linked together with imx-pcm.o into snd-imx-pcm.ko, is not being compiled in this case. The make rules for these files shows that the target object imx-pcm.o is assigned to the variable snd-soc-imx-pcm-y while imx-pcm-{dma,fiq}.o are added to to snd-soc-imx-pcm-$(CONFIG_SND_SOC_IMX_PCM_DMA) and snd-soc-imx-pcm-$(CONFIG_SND_SOC_IMX_PCM_FIQ) which resolve to snd-soc-imx-pcm-m in this case. According to Documentation/kbuild/modules.txt: |When the module is built from multiple sources, an additional line is |needed listing the files: | | <module_name>-y := <src1>.o <src2>.o ... Thus the type of the config variables CONFIG_SND_SOC_IMX_PCM_DMA and CONFIG_SND_SOC_IMX_PCM_FIQ should be 'bool' instead of 'tristate' to resolve to 'y' when selected. Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
generated by cgit v1.2.3 (git 2.39.0) at 2025-02-24 13:59:20 +0300