mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 21:21:41 +00:00
f0fba2ad1b
This patch extends the ASoC API to allow sound cards to have more than one
CODEC and more than one platform DMA controller. This is achieved by dividing
some current ASoC structures that contain both driver data and device data into
structures that only either contain device data or driver data. i.e.
struct snd_soc_codec ---> struct snd_soc_codec (device data)
+-> struct snd_soc_codec_driver (driver data)
struct snd_soc_platform ---> struct snd_soc_platform (device data)
+-> struct snd_soc_platform_driver (driver data)
struct snd_soc_dai ---> struct snd_soc_dai (device data)
+-> struct snd_soc_dai_driver (driver data)
struct snd_soc_device ---> deleted
This now allows ASoC to be more tightly aligned with the Linux driver model and
also means that every ASoC codec, platform and (platform) DAI is a kernel
device. ASoC component private data is now stored as device private data.
The ASoC sound card struct snd_soc_card has also been updated to store lists
of it's components rather than a pointer to a codec and platform. The PCM
runtime struct soc_pcm_runtime now has pointers to all its components.
This patch adds DAPM support for ASoC multi-component and removes struct
snd_soc_socdev from DAPM core. All DAPM calls are now made on a card, codec
or runtime PCM level basis rather than using snd_soc_socdev.
Other notable multi-component changes:-
* Stream operations now de-reference less structures.
* close_delayed work() now runs on a DAI basis rather than looping all DAIs
in a card.
* PM suspend()/resume() operations can now handle N CODECs and Platforms
per sound card.
* Added soc_bind_dai_link() to bind the component devices to the sound card.
* Added soc_dai_link_probe() and soc_dai_link_remove() to probe and remove
DAI link components.
* sysfs entries can now be registered per component per card.
* snd_soc_new_pcms() functionailty rolled into dai_link_probe().
* snd_soc_register_codec() now does all the codec list and mutex init.
This patch changes the probe() and remove() of the CODEC drivers as follows:-
o Make CODEC driver a platform driver
o Moved all struct snd_soc_codec list, mutex, etc initialiasation to core.
o Removed all static codec pointers (drivers now support > 1 codec dev)
o snd_soc_register_pcms() now done by core.
o snd_soc_register_dai() folded into snd_soc_register_codec().
CS4270 portions:
Acked-by: Timur Tabi <timur@freescale.com>
Some TLV320aic23 and Cirrus platform fixes.
Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
TI CODEC and OMAP fixes
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Samsung platform and misc fixes :-
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Seungwhan Youn <sw.youn@samsung.com>
MPC8610 and PPC fixes.
Signed-off-by: Timur Tabi <timur@freescale.com>
i.MX fixes and some core fixes.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
J4740 platform fixes:-
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
CC: Tony Lindgren <tony@atomide.com>
CC: Nicolas Ferre <nicolas.ferre@atmel.com>
CC: Kevin Hilman <khilman@deeprootsystems.com>
CC: Sascha Hauer <s.hauer@pengutronix.de>
CC: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
CC: Kuninori Morimoto <morimoto.kuninori@renesas.com>
CC: Daniel Gloeckner <dg@emlix.com>
CC: Manuel Lauss <mano@roarinelk.homelinux.net>
CC: Mike Frysinger <vapier.adi@gmail.com>
CC: Arnaud Patard <apatard@mandriva.com>
CC: Wan ZongShun <mcuos.com@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
84 lines
2.9 KiB
C
84 lines
2.9 KiB
C
/*
|
|
* at91-pcm.h - ALSA PCM interface for the Atmel AT91 SoC.
|
|
*
|
|
* Copyright (C) 2005 SAN People
|
|
* Copyright (C) 2008 Atmel
|
|
*
|
|
* Authors: Sedji Gaouaou <sedji.gaouaou@atmel.com>
|
|
*
|
|
* Based on at91-pcm. by:
|
|
* Frank Mandarino <fmandarino@endrelia.com>
|
|
* Copyright 2006 Endrelia Technologies Inc.
|
|
*
|
|
* Based on pxa2xx-pcm.c by:
|
|
*
|
|
* Author: Nicolas Pitre
|
|
* Created: Nov 30, 2004
|
|
* Copyright: (C) 2004 MontaVista Software, Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#ifndef _ATMEL_PCM_H
|
|
#define _ATMEL_PCM_H
|
|
|
|
#include <linux/atmel-ssc.h>
|
|
|
|
/*
|
|
* Registers and status bits that are required by the PCM driver.
|
|
*/
|
|
struct atmel_pdc_regs {
|
|
unsigned int xpr; /* PDC recv/trans pointer */
|
|
unsigned int xcr; /* PDC recv/trans counter */
|
|
unsigned int xnpr; /* PDC next recv/trans pointer */
|
|
unsigned int xncr; /* PDC next recv/trans counter */
|
|
unsigned int ptcr; /* PDC transfer control */
|
|
};
|
|
|
|
struct atmel_ssc_mask {
|
|
u32 ssc_enable; /* SSC recv/trans enable */
|
|
u32 ssc_disable; /* SSC recv/trans disable */
|
|
u32 ssc_endx; /* SSC ENDTX or ENDRX */
|
|
u32 ssc_endbuf; /* SSC TXBUFE or RXBUFF */
|
|
u32 pdc_enable; /* PDC recv/trans enable */
|
|
u32 pdc_disable; /* PDC recv/trans disable */
|
|
};
|
|
|
|
/*
|
|
* This structure, shared between the PCM driver and the interface,
|
|
* contains all information required by the PCM driver to perform the
|
|
* PDC DMA operation. All fields except dma_intr_handler() are initialized
|
|
* by the interface. The dms_intr_handler() pointer is set by the PCM
|
|
* driver and called by the interface SSC interrupt handler if it is
|
|
* non-NULL.
|
|
*/
|
|
struct atmel_pcm_dma_params {
|
|
char *name; /* stream identifier */
|
|
int pdc_xfer_size; /* PDC counter increment in bytes */
|
|
struct ssc_device *ssc; /* SSC device for stream */
|
|
struct atmel_pdc_regs *pdc; /* PDC receive or transmit registers */
|
|
struct atmel_ssc_mask *mask; /* SSC & PDC status bits */
|
|
struct snd_pcm_substream *substream;
|
|
void (*dma_intr_handler)(u32, struct snd_pcm_substream *);
|
|
};
|
|
|
|
/*
|
|
* SSC register access (since ssc_writel() / ssc_readl() require literal name)
|
|
*/
|
|
#define ssc_readx(base, reg) (__raw_readl((base) + (reg)))
|
|
#define ssc_writex(base, reg, value) __raw_writel((value), (base) + (reg))
|
|
|
|
#endif /* _ATMEL_PCM_H */
|