mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +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>
74 lines
2.5 KiB
C
74 lines
2.5 KiB
C
/*
|
|
* TXx9 SoC AC Link Controller
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#ifndef __TXX9ACLC_H
|
|
#define __TXX9ACLC_H
|
|
|
|
#include <linux/interrupt.h>
|
|
#include <asm/txx9/dmac.h>
|
|
|
|
#define ACCTLEN 0x00 /* control enable */
|
|
#define ACCTLDIS 0x04 /* control disable */
|
|
#define ACCTL_ENLINK 0x00000001 /* enable/disable AC-link */
|
|
#define ACCTL_AUDODMA 0x00000100 /* AUDODMA enable/disable */
|
|
#define ACCTL_AUDIDMA 0x00001000 /* AUDIDMA enable/disable */
|
|
#define ACCTL_AUDOEHLT 0x00010000 /* AUDO error halt
|
|
enable/disable */
|
|
#define ACCTL_AUDIEHLT 0x00100000 /* AUDI error halt
|
|
enable/disable */
|
|
#define ACREGACC 0x08 /* codec register access */
|
|
#define ACREGACC_DAT_SHIFT 0 /* data field */
|
|
#define ACREGACC_REG_SHIFT 16 /* address field */
|
|
#define ACREGACC_CODECID_SHIFT 24 /* CODEC ID field */
|
|
#define ACREGACC_READ 0x80000000 /* CODEC read */
|
|
#define ACREGACC_WRITE 0x00000000 /* CODEC write */
|
|
#define ACINTSTS 0x10 /* interrupt status */
|
|
#define ACINTMSTS 0x14 /* interrupt masked status */
|
|
#define ACINTEN 0x18 /* interrupt enable */
|
|
#define ACINTDIS 0x1c /* interrupt disable */
|
|
#define ACINT_CODECRDY(n) (0x00000001 << (n)) /* CODECn ready */
|
|
#define ACINT_REGACCRDY 0x00000010 /* ACREGACC ready */
|
|
#define ACINT_AUDOERR 0x00000100 /* AUDO underrun error */
|
|
#define ACINT_AUDIERR 0x00001000 /* AUDI overrun error */
|
|
#define ACDMASTS 0x80 /* DMA request status */
|
|
#define ACDMA_AUDO 0x00000001 /* AUDODMA pending */
|
|
#define ACDMA_AUDI 0x00000010 /* AUDIDMA pending */
|
|
#define ACAUDODAT 0xa0 /* audio out data */
|
|
#define ACAUDIDAT 0xb0 /* audio in data */
|
|
#define ACREVID 0xfc /* revision ID */
|
|
|
|
struct txx9aclc_dmadata {
|
|
struct resource *dma_res;
|
|
struct txx9dmac_slave dma_slave;
|
|
struct dma_chan *dma_chan;
|
|
struct tasklet_struct tasklet;
|
|
spinlock_t dma_lock;
|
|
int stream; /* SNDRV_PCM_STREAM_PLAYBACK or SNDRV_PCM_STREAM_CAPTURE */
|
|
struct snd_pcm_substream *substream;
|
|
unsigned long pos;
|
|
dma_addr_t dma_addr;
|
|
unsigned long buffer_bytes;
|
|
unsigned long period_bytes;
|
|
unsigned long frag_bytes;
|
|
int frags;
|
|
int frag_count;
|
|
int dmacount;
|
|
};
|
|
|
|
struct txx9aclc_plat_drvdata {
|
|
void __iomem *base;
|
|
u64 physbase;
|
|
};
|
|
|
|
static inline struct txx9aclc_plat_drvdata *txx9aclc_get_plat_drvdata(
|
|
struct snd_soc_dai *dai)
|
|
{
|
|
return dev_get_drvdata(dai->dev);
|
|
}
|
|
|
|
#endif /* __TXX9ACLC_H */
|