mirror of
https://github.com/torvalds/linux.git
synced 2024-11-27 14:41:39 +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>
103 lines
2.3 KiB
C
103 lines
2.3 KiB
C
/*
|
|
* wm8940.h -- WM8940 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 _WM8940_H
|
|
#define _WM8940_H
|
|
|
|
struct wm8940_setup_data {
|
|
/* Vref to analogue output resistance */
|
|
#define WM8940_VROI_1K 0
|
|
#define WM8940_VROI_30K 1
|
|
unsigned int vroi:1;
|
|
};
|
|
|
|
/* WM8940 register space */
|
|
#define WM8940_SOFTRESET 0x00
|
|
#define WM8940_POWER1 0x01
|
|
#define WM8940_POWER2 0x02
|
|
#define WM8940_POWER3 0x03
|
|
#define WM8940_IFACE 0x04
|
|
#define WM8940_COMPANDINGCTL 0x05
|
|
#define WM8940_CLOCK 0x06
|
|
#define WM8940_ADDCNTRL 0x07
|
|
#define WM8940_GPIO 0x08
|
|
#define WM8940_CTLINT 0x09
|
|
#define WM8940_DAC 0x0A
|
|
#define WM8940_DACVOL 0x0B
|
|
|
|
#define WM8940_ADC 0x0E
|
|
#define WM8940_ADCVOL 0x0F
|
|
#define WM8940_NOTCH1 0x10
|
|
#define WM8940_NOTCH2 0x11
|
|
#define WM8940_NOTCH3 0x12
|
|
#define WM8940_NOTCH4 0x13
|
|
#define WM8940_NOTCH5 0x14
|
|
#define WM8940_NOTCH6 0x15
|
|
#define WM8940_NOTCH7 0x16
|
|
#define WM8940_NOTCH8 0x17
|
|
#define WM8940_DACLIM1 0x18
|
|
#define WM8940_DACLIM2 0x19
|
|
|
|
#define WM8940_ALC1 0x20
|
|
#define WM8940_ALC2 0x21
|
|
#define WM8940_ALC3 0x22
|
|
#define WM8940_NOISEGATE 0x23
|
|
#define WM8940_PLLN 0x24
|
|
#define WM8940_PLLK1 0x25
|
|
#define WM8940_PLLK2 0x26
|
|
#define WM8940_PLLK3 0x27
|
|
|
|
#define WM8940_ALC4 0x2A
|
|
|
|
#define WM8940_INPUTCTL 0x2C
|
|
#define WM8940_PGAGAIN 0x2D
|
|
|
|
#define WM8940_ADCBOOST 0x2F
|
|
|
|
#define WM8940_OUTPUTCTL 0x31
|
|
#define WM8940_SPKMIX 0x32
|
|
|
|
#define WM8940_SPKVOL 0x36
|
|
|
|
#define WM8940_MONOMIX 0x38
|
|
|
|
#define WM8940_CACHEREGNUM 0x57
|
|
|
|
|
|
/* Clock divider Id's */
|
|
#define WM8940_BCLKDIV 0
|
|
#define WM8940_MCLKDIV 1
|
|
#define WM8940_OPCLKDIV 2
|
|
|
|
/* MCLK clock dividers */
|
|
#define WM8940_MCLKDIV_1 0
|
|
#define WM8940_MCLKDIV_1_5 1
|
|
#define WM8940_MCLKDIV_2 2
|
|
#define WM8940_MCLKDIV_3 3
|
|
#define WM8940_MCLKDIV_4 4
|
|
#define WM8940_MCLKDIV_6 5
|
|
#define WM8940_MCLKDIV_8 6
|
|
#define WM8940_MCLKDIV_12 7
|
|
|
|
/* BCLK clock dividers */
|
|
#define WM8940_BCLKDIV_1 0
|
|
#define WM8940_BCLKDIV_2 1
|
|
#define WM8940_BCLKDIV_4 2
|
|
#define WM8940_BCLKDIV_8 3
|
|
#define WM8940_BCLKDIV_16 4
|
|
#define WM8940_BCLKDIV_32 5
|
|
|
|
/* PLL Out Dividers */
|
|
#define WM8940_OPCLKDIV_1 0
|
|
#define WM8940_OPCLKDIV_2 1
|
|
#define WM8940_OPCLKDIV_3 2
|
|
#define WM8940_OPCLKDIV_4 3
|
|
|
|
#endif /* _WM8940_H */
|
|
|