mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +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>
56 lines
1.5 KiB
C
56 lines
1.5 KiB
C
/*
|
|
* wm8900.h -- WM890 Soc Audio driver
|
|
*
|
|
* 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 _WM8900_H
|
|
#define _WM8900_H
|
|
|
|
#define WM8900_FLL 1
|
|
|
|
#define WM8900_BCLK_DIV 1
|
|
#define WM8900_ADC_CLKDIV 2
|
|
#define WM8900_DAC_CLKDIV 3
|
|
#define WM8900_ADC_LRCLK 4
|
|
#define WM8900_DAC_LRCLK 5
|
|
#define WM8900_OPCLK_DIV 6
|
|
#define WM8900_LRCLK_MODE 7
|
|
|
|
#define WM8900_BCLK_DIV_1 0x00
|
|
#define WM8900_BCLK_DIV_1_5 0x02
|
|
#define WM8900_BCLK_DIV_2 0x04
|
|
#define WM8900_BCLK_DIV_3 0x06
|
|
#define WM8900_BCLK_DIV_4 0x08
|
|
#define WM8900_BCLK_DIV_5_5 0x0a
|
|
#define WM8900_BCLK_DIV_6 0x0c
|
|
#define WM8900_BCLK_DIV_8 0x0e
|
|
#define WM8900_BCLK_DIV_11 0x10
|
|
#define WM8900_BCLK_DIV_12 0x12
|
|
#define WM8900_BCLK_DIV_16 0x14
|
|
#define WM8900_BCLK_DIV_22 0x16
|
|
#define WM8900_BCLK_DIV_24 0x18
|
|
#define WM8900_BCLK_DIV_32 0x1a
|
|
#define WM8900_BCLK_DIV_44 0x1c
|
|
#define WM8900_BCLK_DIV_48 0x1e
|
|
|
|
#define WM8900_ADC_CLKDIV_1 0x00
|
|
#define WM8900_ADC_CLKDIV_1_5 0x20
|
|
#define WM8900_ADC_CLKDIV_2 0x40
|
|
#define WM8900_ADC_CLKDIV_3 0x60
|
|
#define WM8900_ADC_CLKDIV_4 0x80
|
|
#define WM8900_ADC_CLKDIV_5_5 0xa0
|
|
#define WM8900_ADC_CLKDIV_6 0xc0
|
|
|
|
#define WM8900_DAC_CLKDIV_1 0x00
|
|
#define WM8900_DAC_CLKDIV_1_5 0x04
|
|
#define WM8900_DAC_CLKDIV_2 0x08
|
|
#define WM8900_DAC_CLKDIV_3 0x0c
|
|
#define WM8900_DAC_CLKDIV_4 0x10
|
|
#define WM8900_DAC_CLKDIV_5_5 0x14
|
|
#define WM8900_DAC_CLKDIV_6 0x18
|
|
|
|
#endif
|