mirror of
https://github.com/torvalds/linux.git
synced 2024-11-29 15:41:36 +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>
60 lines
1.6 KiB
C
60 lines
1.6 KiB
C
/*
|
|
* sound/soc/blackfin/bf5xx-ac97.h
|
|
*
|
|
* 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 _BF5XX_AC97_H
|
|
#define _BF5XX_AC97_H
|
|
|
|
extern struct snd_ac97_bus_ops bf5xx_ac97_ops;
|
|
extern struct snd_ac97 *ac97;
|
|
/* Frame format in memory, only support stereo currently */
|
|
struct ac97_frame {
|
|
u16 ac97_tag; /* slot 0 */
|
|
u16 ac97_addr; /* slot 1 */
|
|
u16 ac97_data; /* slot 2 */
|
|
u16 ac97_pcm_l; /*slot 3:front left*/
|
|
u16 ac97_pcm_r; /*slot 4:front left*/
|
|
#if defined(CONFIG_SND_BF5XX_MULTICHAN_SUPPORT)
|
|
u16 ac97_mdm_l1;
|
|
u16 ac97_center; /*slot 6:center*/
|
|
u16 ac97_sl; /*slot 7:surround left*/
|
|
u16 ac97_sr; /*slot 8:surround right*/
|
|
u16 ac97_lfe; /*slot 9:lfe*/
|
|
#endif
|
|
} __attribute__ ((packed));
|
|
|
|
/* Speaker location */
|
|
#define SP_FL 0x0001
|
|
#define SP_FR 0x0010
|
|
#define SP_FC 0x0002
|
|
#define SP_LFE 0x0020
|
|
#define SP_SL 0x0004
|
|
#define SP_SR 0x0040
|
|
|
|
#define SP_STEREO (SP_FL | SP_FR)
|
|
#define SP_2DOT1 (SP_FL | SP_FR | SP_LFE)
|
|
#define SP_QUAD (SP_FL | SP_FR | SP_SL | SP_SR)
|
|
#define SP_5DOT1 (SP_FL | SP_FR | SP_FC | SP_LFE | SP_SL | SP_SR)
|
|
|
|
#define TAG_VALID 0x8000
|
|
#define TAG_CMD 0x6000
|
|
#define TAG_PCM_LEFT 0x1000
|
|
#define TAG_PCM_RIGHT 0x0800
|
|
#define TAG_PCM_MDM_L1 0x0400
|
|
#define TAG_PCM_CENTER 0x0200
|
|
#define TAG_PCM_SL 0x0100
|
|
#define TAG_PCM_SR 0x0080
|
|
#define TAG_PCM_LFE 0x0040
|
|
|
|
void bf5xx_pcm_to_ac97(struct ac97_frame *dst, const __u16 *src, \
|
|
size_t count, unsigned int chan_mask);
|
|
|
|
void bf5xx_ac97_to_pcm(const struct ac97_frame *src, __u16 *dst, \
|
|
size_t count);
|
|
|
|
#endif
|