aboutsummaryrefslogtreecommitdiffstats
path: root/sound/arm
Commit message (Collapse)AuthorAge
* ALSA: sound/arm: Fix build failure caused by missing struct aaci definitionPeter Huewe2009-12-26
| | | | | | | | | | | | | | | | | | | This patch fixes a build failure introduced by the patch ALSA: AACI: factor common hw_params logic into aaci_pcm_hw_params [1] by adding/moving the aaci struct to the right position. The patch mentioned above merged common source parts into one function, but unfortunately left out the aaci struct and consequently caused a build failure e.g. for arm versatile_config [2] References: [1] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=d3aee7996c30f928bbbbfd0994148e35d2e83084 [2] http://kisskb.ellerman.id.au/kisskb/buildresult/1893605/ Patch against Linus' tree. Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: AACI: switch to per-pcm lockingRussell King2009-12-18
| | | | | | | | We can use finer-grained locking, which makes things easier when we gain DMA support. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: AACI: add double-rate supportRussell King2009-12-18
| | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: AACI: factor common hw_params logic into aaci_pcm_hw_paramsRussell King2009-12-18
| | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: AACI: cleanup aaci_pcm_hw_paramsRussell King2009-12-18
| | | | | | | | Since the recording and playback paths are now the same, eliminate the needless conditionals. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: AACI: simplify codec rate informationRussell King2009-12-18
| | | | | | | | | There's no need for a specific rule; ALSA's generic AC'97 support calculates the necessary rate constraint information itself, and we can use this directly. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: aaci - Fix a typoTakashi Iwai2009-12-18
| | | | | | | Fixed a typo of the max buffer size specified for buffer allocation changed in the commit d6797322231af98b9bb4afb175dd614cf511e5f7. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* const: constify remaining dev_pm_opsAlexey Dobriyan2009-12-15
| | | | | | Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge branch 'topic/misc' into for-linusTakashi Iwai2009-12-04
|\
| * ALSA: aaci - Clean up duplicate codeTakashi Iwai2009-12-01
| | | | | | | | | | | | | | Now snd_ac97_pcm_open() is called with the exactly same arguments for both playback and capture directions. Remove the unneeded check. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * Merge branch 'fix/misc' into topic/miscTakashi Iwai2009-12-01
| |\
| * | ALSA: AACI cleanupRussell King2009-11-23
| | | | | | | | | | | | | | | | | | | | | Fix the buffer size calculation to use the size which ALSA is expecting. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge branch 'topic/core-change' into for-linusTakashi Iwai2009-12-04
|\ \ \ | |_|/ |/| |
| * | ALSA: Remove old DMA-mmap code from arm/devdma.cTakashi Iwai2009-11-27
| |/ | | | | | | | | | | The call of dma_mmap_coherent() is done in the PCM core now. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: AACI: fix recording bugRussell King2009-11-30
| | | | | | | | | | | | | | | | | | | | pcm->r[1].slots is the double rate slot information, not the capture information. For capture, 'pcm' will already be the capture ac97 pcm structure. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: AACI: fix AC97 multiple-open bugRussell King2009-11-30
|/ | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: aaci: ARM1176 aaci-pl041 AC97 register read timeoutPhilby John2009-10-13
| | | | | | | | | | | | | | After a reboot on an ARM1176 which amounts to a softreset, it has been noted that the ALSA driver does not get registered and the probe fails with the error "aaci-pl041 fpga:04: ac97 read back fail". In the process of reading from a register the SL1TxBusy bit is set indicating that the transceiver is busy and remains so until the default timeout occurs. Set the Power down register 0x26 to an arbitrary value as specified in the PL041 manual (page: 3-18) so that AACISL1TX/AACISL2TX registers take their default state. Signed-off-by: Philby John <pjohn@in.mvista.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* Merge branch 'devel' of ↵Russell King2009-09-21
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
| * [ARM] pxa: update pxa2xx-ac97.c to use 'struct dev_pm_ops'Mike Rapoport2009-09-10
| | | | | | | | | | Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* | ASoC: fix pxa2xx-ac97.c breakageRobert Schwebel2009-09-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Today's linux-next fails to build with sound/arm/pxa2xx-ac97.c: In function 'pxa2xx_ac97_probe': sound/arm/pxa2xx-ac97.c:211: error: 'pxa2xx_audio_ops_t' has no member named 'codec_data' make[2]: *** [sound/arm/pxa2xx-ac97.o] Error 1 It looks like commit e2365bf313fb21b49b1e4c911033389564428d03 has introduced this; patch below. Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | ASoC: Pass correct platform data from pxa2xx-ac97Marek Vasut2009-08-23
| | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | ALSA: Restore support for DMAless DAIs on PXAMark Brown2009-08-19
| | | | | | | | | | | | | | | | | | Used for applications such as direct bluetooth connections on smartphones which don't go via the CPU. This used to be supported before the refactoring to share code but this check was removed during that move. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | ALSA: Allow passing platform_data for pxa2xx-ac97Marek Vasut2009-08-13
|/ | | | | | | | This patch adds support for passing platform data to ac97 bus devices from PXA2xx-AC97 driver.. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* ASoC: Fix NULL pointer dereference in __pxa2xx_pcm_hw_freeDaniel Mack2009-07-09
| | | | | | | Check for rtd->params->drcmr != NULL before accessing it. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* [ARM] 5544/1: Trust PrimeCell resource sizesLinus Walleij2009-06-11
| | | | | | | | | | | | | | | | | | I found the PrimeCell/AMBA Bus drivers distrusting the resource passed in as part of the struct amba_device abstraction. This patch removes all hard coded resource sizes found in the PrimeCell drivers and move the responsibility of this definition back to the platform/board device definition, which already exist and appear to be correct for all in-tree users of these drivers. We do this using the resource_size() inline function which was also replicated in the only driver using the resource size, so that has been changed too. The KMI_SIZE was left in kmi.h in case someone likes it. Test-compiled against Versatile and Integrator defconfigs, seems to work but I don't posess these boards and cannot test them. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 5519/1: amba probe: pass "struct amba_id *" instead of void *Alessandro Rubini2009-05-20
| | | | | | | | | | | | The second argument of the probe method points to the amba_id structure, so it's better passed with the correct type. None of the current in-tree drivers uses the pointer, so they have only been checked for a clean compile. Change suggested by Russell King. Signed-off-by: Alessandro Rubini <rubini@unipv.it> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* pxa2xx-ac97: fix reset gpio mode settingMike Rapoport2009-05-11
| | | | | | Signed-off-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* [ARM] pxa: merge AC97 platform data structuresMark Brown2009-04-14
| | | | | | | | | | | | | | | | | Currently there are two possible platform datas for the PXA AC97 driver: one supported by the generic AC97 driver only which provides callbacks to allow board-specific configuration at stream startup and teardown, and another for pxa2xx-ac97-lib which allows configuration of the reset GPIO for PXA2xx CPUs. Obviously this won't actually work when using the generic AC97 driver since the drivers will attempt to parse the platform data in both formats. Fix this by merging the two structures. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Cc: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* Merge branch 'topic/asoc' into for-linusTakashi Iwai2009-04-05
|\
| * pxa2xx-ac97: fix displaying GSR after reset timeoutLuotao Fu2009-04-02
| | | | | | | | | | | | | | | | | | the variable gsr_bit is set in isr. It is however set to 0 and interrupts are disabled prior to reset. Hence it doesn't make a lot of sense to show the content of gsr_bit in case of a reset timeout. Signed-off-by: Luotao Fu <l.fu@pengutronix.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | Merge branch 'origin' into develRussell King2009-03-28
|\ \ | | | | | | | | | | | | Conflicts: sound/soc/pxa/pxa2xx-i2s.c
| * \ Merge branch 'topic/drop-l3' into for-linusTakashi Iwai2009-03-23
| |\ \
| | * | ALSA: drop outdated and broken sa11xx-uda1341 driverDmitry Artamonow2009-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It depends on L3 support from 2.4 kernel (CONFIG_L3) that never got merged into mainline. Since there's no way to use it on any of supported machines (iPaq h3100 or h3600), better drop it for now. It can be reimplemented later using ASoC infrastructure (there's already a driver for uda1341 codec in mainline, so only CPU and machine parts need to be written). Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Cc: Russell King <linux@arm.linux.org.uk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| | * | Merge branch 'topic/snd_card_new-err' into topic/drop-l3Takashi Iwai2009-03-17
| | |\ \
| * | \ \ Merge branch 'topic/asoc' into for-linusTakashi Iwai2009-03-23
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | ALSA: Fix wrong pointer to dev_err() in arm/pxa2xx-ac97-lib.cTakashi Iwai2009-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the wrong device pointer passed to dev_err(). Signed-off-by: Takashi Iwai <tiwai@suse.de>
| | * | | ASoC: Allow choice of ac97 gpio reset lineRobert Jarzmik2009-03-15
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the PXA27x series allow 2 gpios to reset the ac97 bus, allow through platform data configuration the definition of the correct gpio which will reset the AC97 bus. This comes from a silicon defect on the PXA27x series, where the gpio must be manually controlled in warm reset cases. Signed-off-by: Robert Jarzmik <rjarzmik@free.fr> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | | Merge branch 'topic/misc' into for-linusTakashi Iwai2009-03-23
| |\ \ \ | | | |/ | | |/|
| | * | ALSA: Add missing KERN_* prefix to printk in other sound/*Takashi Iwai2009-02-05
| | | | | | | | | | | | | | | | Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | Merge branch 'topic/snd_card_new-err' into for-linusTakashi Iwai2009-03-23
| |\ \ \ | | | |/ | | |/|
| | * | ALSA: Convert to snd_card_create() in other sound/*Takashi Iwai2009-01-12
| | |/ | | | | | | | | | | | | | | | | | | Convert from snd_card_new() to the new snd_card_create() function in other sound subdirectories. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into develRussell King2009-03-13
|\| | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-at91/gpio.c
| * | [ARM] AACI: timeout will reach -1Roel Kluin2009-02-10
| |/ | | | | | | | | | | | | | | With a postfix decrement the timeout will reach -1 rather than 0, so the warning will not be issued. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* / [ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.hEric Miao2009-03-09
|/ | | | | | | pxa-regs.h and hardware.h are not intended for use directly in driver code, remove those unnecessary references. Signed-off-by: Eric Miao <eric.miao@marvell.com>
* pxa2xx-ac97: switch AC unit to correct state before probingDmitry Baryshkov2009-01-05
| | | | | | | | | If AC97 unit is in partially enabled state, early request_irq can trigger IRQ storm or even full hang up. Workaround this by forcibly switching ACLINK off at the start of the probe. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* [ARM] pxa: move AC97 register definitions into dedicated regs-ac97.hEric Miao2008-12-02
| | | | | | | | The optimal change would be to move the AC97 register definitions into the AC97 driver, unfortunately, the registers are shared between several files. Move them into a dedicated regs-ac97.h first. Signed-off-by: Eric Miao <eric.miao@marvell.com>
* [ARM] pxa: explicit #include <mach/dma.h> in various driversEric Miao2008-12-02
| | | | | | Where 'pxa_dma_desc' and 'pxa_{request,free}_dma' are referenced. Signed-off-by: Eric Miao <eric.miao@marvell.com>
*-. Merge branches 'topic/asoc', 'topic/misc-fixes' and 'topic/hda' into for-linusTakashi Iwai2008-10-23
|\ \
| | * ALSA: Ensure PXA runtime data is initialisedMark Brown2008-10-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | The rest of the code relies on the runtime data being zero initialised so we need to use kzalloc() to allocate it. Reported-by: Oliver Ford <ipaqlinux@oliford.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge branch 'for-linus' of ↵Linus Torvalds2008-10-16
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: us122l: fix missing unlock in usb_stream_hwdep_vm_fault() ALSA: hda - Fix quirk lists for realtek codecs ALSA: hda - Add support of ALC272 ALSA: hda - Add ALC887 support ALSA: hda - Add ALC1200 support ALSA: hda - Fix PCI SSID of ASUS M90V ALSA: hda - Add auto mic switch in realtek auto-probe mode ALSA: Fix pxa2xx-ac97-lib.c compilation ALSA: ASoC: Hide TLV320AIC26 configuration option for non-OpenFirwmare users ALSA: hda: fix nid variable warning ALSA: ASoC: Fix compile-time warning for tlv320aic23.c
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-11 19:07:21 -0500