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>
93 lines
3.4 KiB
C
93 lines
3.4 KiB
C
/*
|
|
* Texas Instruments TLV320AIC26 low power audio CODEC
|
|
* register definitions
|
|
*
|
|
* Copyright (C) 2008 Secret Lab Technologies Ltd.
|
|
*/
|
|
|
|
#ifndef _TLV320AIC16_H_
|
|
#define _TLV320AIC16_H_
|
|
|
|
/* AIC26 Registers */
|
|
#define AIC26_READ_COMMAND_WORD(addr) ((1 << 15) | (addr << 5))
|
|
#define AIC26_WRITE_COMMAND_WORD(addr) ((0 << 15) | (addr << 5))
|
|
#define AIC26_PAGE_ADDR(page, offset) ((page << 6) | offset)
|
|
#define AIC26_NUM_REGS AIC26_PAGE_ADDR(3, 0)
|
|
|
|
/* Page 0: Auxillary data registers */
|
|
#define AIC26_REG_BAT1 AIC26_PAGE_ADDR(0, 0x05)
|
|
#define AIC26_REG_BAT2 AIC26_PAGE_ADDR(0, 0x06)
|
|
#define AIC26_REG_AUX AIC26_PAGE_ADDR(0, 0x07)
|
|
#define AIC26_REG_TEMP1 AIC26_PAGE_ADDR(0, 0x09)
|
|
#define AIC26_REG_TEMP2 AIC26_PAGE_ADDR(0, 0x0A)
|
|
|
|
/* Page 1: Auxillary control registers */
|
|
#define AIC26_REG_AUX_ADC AIC26_PAGE_ADDR(1, 0x00)
|
|
#define AIC26_REG_STATUS AIC26_PAGE_ADDR(1, 0x01)
|
|
#define AIC26_REG_REFERENCE AIC26_PAGE_ADDR(1, 0x03)
|
|
#define AIC26_REG_RESET AIC26_PAGE_ADDR(1, 0x04)
|
|
|
|
/* Page 2: Audio control registers */
|
|
#define AIC26_REG_AUDIO_CTRL1 AIC26_PAGE_ADDR(2, 0x00)
|
|
#define AIC26_REG_ADC_GAIN AIC26_PAGE_ADDR(2, 0x01)
|
|
#define AIC26_REG_DAC_GAIN AIC26_PAGE_ADDR(2, 0x02)
|
|
#define AIC26_REG_SIDETONE AIC26_PAGE_ADDR(2, 0x03)
|
|
#define AIC26_REG_AUDIO_CTRL2 AIC26_PAGE_ADDR(2, 0x04)
|
|
#define AIC26_REG_POWER_CTRL AIC26_PAGE_ADDR(2, 0x05)
|
|
#define AIC26_REG_AUDIO_CTRL3 AIC26_PAGE_ADDR(2, 0x06)
|
|
|
|
#define AIC26_REG_FILTER_COEFF_L_N0 AIC26_PAGE_ADDR(2, 0x07)
|
|
#define AIC26_REG_FILTER_COEFF_L_N1 AIC26_PAGE_ADDR(2, 0x08)
|
|
#define AIC26_REG_FILTER_COEFF_L_N2 AIC26_PAGE_ADDR(2, 0x09)
|
|
#define AIC26_REG_FILTER_COEFF_L_N3 AIC26_PAGE_ADDR(2, 0x0A)
|
|
#define AIC26_REG_FILTER_COEFF_L_N4 AIC26_PAGE_ADDR(2, 0x0B)
|
|
#define AIC26_REG_FILTER_COEFF_L_N5 AIC26_PAGE_ADDR(2, 0x0C)
|
|
#define AIC26_REG_FILTER_COEFF_L_D1 AIC26_PAGE_ADDR(2, 0x0D)
|
|
#define AIC26_REG_FILTER_COEFF_L_D2 AIC26_PAGE_ADDR(2, 0x0E)
|
|
#define AIC26_REG_FILTER_COEFF_L_D4 AIC26_PAGE_ADDR(2, 0x0F)
|
|
#define AIC26_REG_FILTER_COEFF_L_D5 AIC26_PAGE_ADDR(2, 0x10)
|
|
#define AIC26_REG_FILTER_COEFF_R_N0 AIC26_PAGE_ADDR(2, 0x11)
|
|
#define AIC26_REG_FILTER_COEFF_R_N1 AIC26_PAGE_ADDR(2, 0x12)
|
|
#define AIC26_REG_FILTER_COEFF_R_N2 AIC26_PAGE_ADDR(2, 0x13)
|
|
#define AIC26_REG_FILTER_COEFF_R_N3 AIC26_PAGE_ADDR(2, 0x14)
|
|
#define AIC26_REG_FILTER_COEFF_R_N4 AIC26_PAGE_ADDR(2, 0x15)
|
|
#define AIC26_REG_FILTER_COEFF_R_N5 AIC26_PAGE_ADDR(2, 0x16)
|
|
#define AIC26_REG_FILTER_COEFF_R_D1 AIC26_PAGE_ADDR(2, 0x17)
|
|
#define AIC26_REG_FILTER_COEFF_R_D2 AIC26_PAGE_ADDR(2, 0x18)
|
|
#define AIC26_REG_FILTER_COEFF_R_D4 AIC26_PAGE_ADDR(2, 0x19)
|
|
#define AIC26_REG_FILTER_COEFF_R_D5 AIC26_PAGE_ADDR(2, 0x1A)
|
|
|
|
#define AIC26_REG_PLL_PROG1 AIC26_PAGE_ADDR(2, 0x1B)
|
|
#define AIC26_REG_PLL_PROG2 AIC26_PAGE_ADDR(2, 0x1C)
|
|
#define AIC26_REG_AUDIO_CTRL4 AIC26_PAGE_ADDR(2, 0x1D)
|
|
#define AIC26_REG_AUDIO_CTRL5 AIC26_PAGE_ADDR(2, 0x1E)
|
|
|
|
/* fsref dividers; used in register 'Audio Control 1' */
|
|
enum aic26_divisors {
|
|
AIC26_DIV_1 = 0,
|
|
AIC26_DIV_1_5 = 1,
|
|
AIC26_DIV_2 = 2,
|
|
AIC26_DIV_3 = 3,
|
|
AIC26_DIV_4 = 4,
|
|
AIC26_DIV_5 = 5,
|
|
AIC26_DIV_5_5 = 6,
|
|
AIC26_DIV_6 = 7,
|
|
};
|
|
|
|
/* Digital data format */
|
|
enum aic26_datfm {
|
|
AIC26_DATFM_I2S = 0 << 8,
|
|
AIC26_DATFM_DSP = 1 << 8,
|
|
AIC26_DATFM_RIGHTJ = 2 << 8, /* right justified */
|
|
AIC26_DATFM_LEFTJ = 3 << 8, /* left justified */
|
|
};
|
|
|
|
/* Sample word length in bits; used in register 'Audio Control 1' */
|
|
enum aic26_wlen {
|
|
AIC26_WLEN_16 = 0 << 10,
|
|
AIC26_WLEN_20 = 1 << 10,
|
|
AIC26_WLEN_24 = 2 << 10,
|
|
AIC26_WLEN_32 = 3 << 10,
|
|
};
|
|
|
|
#endif /* _TLV320AIC16_H_ */
|