aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* ASoC: Merge dai_ops factor outMark Brown2009-03-11
|\ | | | | | | | | | | | | | | Merge Eric Maio's patch to merge snd_soc_dai_ops out of line. Fixed merge issues and updated drivers, plus an issue with the ops for the two s3c2443 AC97 DAIs having been merged. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: make ops a pointer in 'struct snd_soc_dai'Eric Miao2009-03-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Considering the fact that most cpu_dai or codec_dai are using a same 'snd_soc_dai_ops' for several similar interfaces, 'ops' would be better made a pointer instead, to make sharing easier and code a bit cleaner. The patch below is rather preliminary since the asoc tree is being actively developed, and this touches almost every piece of code, (and possibly many others in development need to be changed as well). Building of all codecs are OK, yet to every SoC, I didn't test that. Signed-off-by: Eric Miao <eric.miao@marvell.com> Acked-by: Timur Tabi <timur@freescale.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | ASoC: Fix formats for s3c24xx-i2s register printsMark Brown2009-03-11
| | | | | | | | | | | | The register values are all u32 so don't need the long format. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | ASoC: Remove version display from WM8580 driverMark Brown2009-03-11
| | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | ASoC: Add initial driver for the WM8400 CODECMark Brown2009-03-11
| | | | | | | | | | | | | | | | | | | | | | | | The WM8400 is a highly integrated audio CODEC and power management unit intended for mobile multimedia application. This driver supports the primary audio CODEC features, including: - 1W speaker driver - Fully differential headphone output - Up to 4 differential microphone inputs Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | ASoC: buildfix for OSKDavid Brownell2009-03-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Buildfix: CC sound/soc/omap/osk5912.o sound/soc/omap/osk5912.c: In function 'osk_soc_init': sound/soc/omap/osk5912.c:189: error: implicit declaration of function 'clk_get_usecount' make[3]: *** [sound/soc/omap/osk5912.o] Error 1 There's no such (standard) clock interface. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | Merge branch 's3c-iis-header' into for-2.6.30Mark Brown2009-03-11
|\ \ | | | | | | | | | | | | Conflicts: arch/arm/mach-shark/include/mach/io.h
| * | [ARM] Revert extraneous changes from the S3C audio header moveMark Brown2009-03-11
| | | | | | | | | | | | | | | | | | | | | These changes were included in the S3C audio header move but are not directly related to it. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: Fix up merge with the ARM treeMark Brown2009-03-10
| | | | | | | | | | | | | | | | | | | | | The same change has been made with the final lines in slightly differnet orders. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: don't touch pxa-ssp registers when stream is runningDaniel Mack2009-03-10
| | | | | | | | | | | | | | | | | | | | | | | | In pxa_ssp_set_dai_fmt(), check whether there is anything to do at all. If there would be but the SSP port is in use already, bail out. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ALSA: ASoC: Davinci: Updated sffsdr_hw_params() function to new formatHugo Villeneuve2009-03-10
| | | | | | | | | | | | | | | Signed-off-by: Hugo Villeneuve <hugo@hugovil.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ALSA: ASoC: Davinci: Replaced DAI format RIGHT_J by DSP_B for SFFSDRHugo Villeneuve2009-03-10
| | | | | | | | | | | | | | | Signed-off-by: Hugo Villeneuve <hugo@hugovil.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | Merge commit 'takashi/topic/asoc' into for-2.6.30Mark Brown2009-03-10
|\ \ \
| * \ \ Merge branch 'for-2.6.30' of ↵Takashi Iwai2009-03-09
| |\ \ \ | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
| * | | | ASoC: Fix Kconfig dependency of CONFIG_SND_S3C24XX_SOC_JIVE_WM8750Takashi Iwai2009-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a non-existing Kconfig CONFIG_SND_SOC_WM8750_SPI. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | | ASoC: Fix Samsung S3C2412_IISMOD_SDF_{MSB,LSB} definitionsBen Dooks2009-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The definitions of S3C2412_IISMOD_SDF_MSB and S3C2412_IISMOD_SDF_LSB are incorrect, being the same S3C2412_IISMOD_SDF_IIS which is the only correct one in this series. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | | ASoC: Convert PXA AC97 driver to probe with the platform deviceMark Brown2009-03-09
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | This will break any boards that don't register the AC97 controller device due to using ASoC. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | ASoC: Add a driver for AK4104 S/PDIF transmitterDaniel Mack2009-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a driver for the SPI connected AK4104 S/PDIF transmitter device. Its features are fairly simple, but as there is need to set up certain bits in the IEC958 information, this better goes into a real driver. Signed-off-by: Daniel Mack <daniel@caiaq.de> Cc: Mark Brown <broonie@sirena.org.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | ASoC: Remove unneeded forward reference to WM8753 SPI implementationMark Brown2009-03-08
| | | | | | | | | | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | ASoC: bring cs4270 feature/limitations list in syncDaniel Mack2009-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes numbers from the list of features/limitations and makes it reflect recent changes to the code. Signed-off-by: Daniel Mack <daniel@caiaq.de> Acked-by: Timur Tabi <timur@freescale.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | ASoC: Improve pause/unpause performance in Freescale 8610 driversTimur Tabi2009-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for true pause and unpause. Without this, mplayer will drop some audio (less than one second, but still noticeable) when pausing playback. Remove support for PM suspend and resume from the trigger function, since the driver doesn't support PM anyway. Optimize the delay after starting capture. Instead of delaying 1ms, the driver now polls the hardware. The new delay is shorter by over 90% yet still effective. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | ASoC: Davinci: Fix incorrect machine type for SFFSDR boardHugo Villeneuve2009-03-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Hugo Villeneuve <hugo@hugovil.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | ASoC: Fix logging severity for some S3C error messagesMark Brown2009-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade the severity of some failure messages from debug level so they're displayed by default. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | ASoC: Re-remove hand-rolled pr_debug() macrosMark Brown2009-03-06
|/ / / | | | | | | | | | | | | | | | | | | | | | The recent set of S3C64xx patches re-added a lot of uses of DBG() that had previously been removed - revert this so the standard pr_debug() macro is used. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: Staticise workqueue function for GPIO jack detectionMark Brown2009-03-06
| | | | | | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: Blackfin: fix typo in MUTE definitionMike Frysinger2009-03-06
| | | | | | | | | | | | | | | | | | | | | Reported-by: Rob Maris <maris.rob@vdi.de> Signed-off-by: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: Blackfin: move gpio_err behind the define that is only user of itMike Frysinger2009-03-06
| | | | | | | | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: Add headset jack detection for SDP3430 machine driverLopez Cruz, Misael2009-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add headset jack detection for SDP3430 boards using SoC jack reporting interface. Headset detection on SDP3430 board is achieved through TWL4030 GPIO_2 pin. Signed-off-by: Misael Lopez Cruz <x0052729@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: add support for SSI asynchronous mode to the Freescale SSI driversTimur Tabi2009-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new device tree property for the SSI node: "fsl,ssi-asynchronous". If defined, the SSI is programmed into asynchronous mode, otherwise it is programmed into synchronous mode. In asynchronous mode, pin SRCK must be connected to the same clock source as STFS, and pin SRFS must be connected to the same signal as STFS. Asynchronous mode allows playback and capture to use different sample sizes. It also technically allows different sample rates, but the driver does not support that. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: Update Kconfig for Samsung CPUs to reflect S3C64xx supportMark Brown2009-03-06
| | | | | | | | | | | | | | | | | | | | | We now support the 64xx series as well as the 24xx series - make sure people using Kconfig know this. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: Fix memory allocation for snd_soc_dapm_switch namesMark Brown2009-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | snd_soc_dapm_switch ends up ends up in dapm_new_mixer() (since a switch is a special case of a mixer with only one input) but this wasn't correctly handled in the code. Also fix the coding style for the switch below while we're here. Reported-by: Joonyoung Shim <dofmind@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: add two more bitfields for PXA SSPDaniel Mack2009-03-06
| | | | | | | | | | | | | | | | | | | | | | | | Add two more bitfields for the PSP register. As they seem to exist for PXA3xx only, define them conditionally. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: Factor out DAPM widget power check into separate functionMark Brown2009-03-06
| | | | | | | | | | | | | | | | | | | | | Essentially simple code motion to facilitate refactoring of the power decisions. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: Fix name of register bit in pxa-sspDaniel Mack2009-03-06
| | | | | | | | | | | | | | | | | | | | | | | | A bit in PXA's SSCR0 register was erroneously named ADC but its name is in fact ACS (audio clock select). Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: TWL4030: Make the HS ramp delay configurablePeter Ujfalusi2009-03-06
| | | | | | | | | | | | | | | | | | | | | Enum type for selecting the desired ramp delay for the headset output. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: Refresh JIVE driverMark Brown2009-03-06
| | | | | | | | | | | | | | | | | | Remove uneeded startup callback and use snd_soc_dapm_nc_pin() Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: Select DMA if I2S is configuredBen Dooks2009-03-06
| | | | | | | | | | | | | | | | | | | | | | | | Select the relevant DMA implementation when the sound driver is selected. Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: Add s3c64xx-i2s supportBen Dooks2009-03-06
| | | | | | | | | | | | | | | | | | | | | | | | Add the initial code to support the S3C64XX I2S hardware using the s3c-i2s-v2 core code. Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: Split s3c2412-i2s.c into core and SoC specific partsBen Dooks2009-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The S3C2412 I2S (IIS) interface is replicated on further Samsung SoC parts in a broadly compatible way, so split the common code out into a core called s3c-i2s-v2.[ch] so that the newer SoCs such as the S3C6410 can make use of it. As such, all the original s3c2412 functions are currently being left with their original names, and will be renamed later in the series. Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: Add JIVE audio supportBen Dooks2009-03-06
| | | | | | | | | | | | | | | | | | | | | Add support for the Jive's WM8750 codec attached via the S3C2412 IIS. Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: Add DAPM machine widgets to SDP3430 driverLopez Cruz, Misael2009-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add DAPM machine domain widgets to SDP3430 machine driver. Interconnection: * Ext Mic: MAINMIC, SUBMIC * Ext Spk: HFL, HFR * Headset Jack: HSMIC, HSOL, HSOR Signed-off-by: Misael Lopez Cruz <x0052729@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | Merge commit 's3c-iis-header' into HEADMark Brown2009-03-06
|\| |
| * | S3C: Move <mach/audio.h> to <plat/audio.h>Ben Dooks2009-03-05
| | | | | | | | | | | | | | | | | | | | | | | | The <mach/audio.h> file needs to be common to both ARCH_S3C2410 and ARCH_S3C64XX as they share common driver code, so move it to <plat/audio.h>. Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | S3C24XX: Move and update IIS headersBen Dooks2009-03-05
| | | | | | | | | | | | | | | | | | | | | Move the IIS headers to their correct place. Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: wm8510 pll settingsJonas Andersson2009-03-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When setting WM8510_MCLKDIV the pll was turned off. When setting pll frequency you got twice the expected freq, because the code calculated with postscaler of 8, but the hardware divide by 4. Signed-off-by: Jonas Andersson <jonas@microbit.se> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: Add GPIO support for jack reporting interfaceLopez Cruz, Misael2009-03-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GPIO support to jack reporting framework in ASoC using gpiolib calls. The gpio support exports two new functions: snd_soc_jack_add_gpios and snd_soc_jack_free_gpios. Client drivers using gpio feature must pass an array of jack_gpio pins belonging to a specific jack to the snd_soc_jack_add_gpios function. The framework will request the gpios, set the data direction and request irq. The framework will update power status of related jack_pins when an event on the gpio pins comes according to the reporting bits defined for each gpio. All gpio resources allocated when adding jack_gpio pins can be released using snd_soc_jack_free_gpios function. Signed-off-by: Misael Lopez Cruz <x0052729@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: UDA1380: DATAI is slave onlyPhilipp Zabel2009-03-03
| | | | | | | | | | | | | | | | | | | | | Only allow SND_SOC_DAIFMT_CBS_CFS for the playback DAI. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: Use network mode with 2 slots for 16-bit stereo in pxa-ssp/ZylonitePhilipp Zabel2009-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For consistency with 24-bit and 32-bit modes, don't send 16-bit stereo in one 32-bit transfer. Use 2 slots instead on Zylonite. It should result in exactly the same behaviour. Now it is possible to use 16-bit single slot transfers in pxa-ssp, which are needed for Magician to get two frame clock pulses per sample (one for each channel). Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Tested-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: UDA1380: change decimator/interpolator register handlingPhilipp Zabel2009-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the UDA1380's interpolator or decimator are set to be clocked from the WSPLL (which syncs to the WSI signal), the DAI link must be running to change the interpolator/decimator registers (which include volume controls and digital mute setting). * Queue work in the alsa PCM_START .trigger to flush registers as soon as the link is running. This replaces the .prepare and .digital_mute callbacks. * Use the SILENCE override instead of MTM for muting and remove its alsa control to avoid confusion. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | ASoC: Remove version display from the UDA1380 driverPhilipp Zabel2009-03-03
| |/ |/| | | | | | | Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-17 10:12:15 -0500