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>
83 lines
2.7 KiB
C
83 lines
2.7 KiB
C
/*
|
|
* AD193X Audio Codec driver
|
|
*
|
|
* Copyright 2010 Analog Devices Inc.
|
|
*
|
|
* Licensed under the GPL-2 or later.
|
|
*/
|
|
|
|
#ifndef __AD193X_H__
|
|
#define __AD193X_H__
|
|
|
|
#define AD193X_PLL_CLK_CTRL0 0x800
|
|
#define AD193X_PLL_POWERDOWN 0x01
|
|
#define AD193X_PLL_INPUT_MASK (~0x6)
|
|
#define AD193X_PLL_INPUT_256 (0 << 1)
|
|
#define AD193X_PLL_INPUT_384 (1 << 1)
|
|
#define AD193X_PLL_INPUT_512 (2 << 1)
|
|
#define AD193X_PLL_INPUT_768 (3 << 1)
|
|
#define AD193X_PLL_CLK_CTRL1 0x801
|
|
#define AD193X_DAC_CTRL0 0x802
|
|
#define AD193X_DAC_POWERDOWN 0x01
|
|
#define AD193X_DAC_SERFMT_MASK 0xC0
|
|
#define AD193X_DAC_SERFMT_STEREO (0 << 6)
|
|
#define AD193X_DAC_SERFMT_TDM (1 << 6)
|
|
#define AD193X_DAC_CTRL1 0x803
|
|
#define AD193X_DAC_2_CHANNELS 0
|
|
#define AD193X_DAC_4_CHANNELS 1
|
|
#define AD193X_DAC_8_CHANNELS 2
|
|
#define AD193X_DAC_16_CHANNELS 3
|
|
#define AD193X_DAC_CHAN_SHFT 1
|
|
#define AD193X_DAC_CHAN_MASK (3 << AD193X_DAC_CHAN_SHFT)
|
|
#define AD193X_DAC_LCR_MASTER (1 << 4)
|
|
#define AD193X_DAC_BCLK_MASTER (1 << 5)
|
|
#define AD193X_DAC_LEFT_HIGH (1 << 3)
|
|
#define AD193X_DAC_BCLK_INV (1 << 7)
|
|
#define AD193X_DAC_CTRL2 0x804
|
|
#define AD193X_DAC_WORD_LEN_MASK 0xC
|
|
#define AD193X_DAC_MASTER_MUTE 1
|
|
#define AD193X_DAC_CHNL_MUTE 0x805
|
|
#define AD193X_DACL1_MUTE 0
|
|
#define AD193X_DACR1_MUTE 1
|
|
#define AD193X_DACL2_MUTE 2
|
|
#define AD193X_DACR2_MUTE 3
|
|
#define AD193X_DACL3_MUTE 4
|
|
#define AD193X_DACR3_MUTE 5
|
|
#define AD193X_DACL4_MUTE 6
|
|
#define AD193X_DACR4_MUTE 7
|
|
#define AD193X_DAC_L1_VOL 0x806
|
|
#define AD193X_DAC_R1_VOL 0x807
|
|
#define AD193X_DAC_L2_VOL 0x808
|
|
#define AD193X_DAC_R2_VOL 0x809
|
|
#define AD193X_DAC_L3_VOL 0x80a
|
|
#define AD193X_DAC_R3_VOL 0x80b
|
|
#define AD193X_DAC_L4_VOL 0x80c
|
|
#define AD193X_DAC_R4_VOL 0x80d
|
|
#define AD193X_ADC_CTRL0 0x80e
|
|
#define AD193X_ADC_POWERDOWN 0x01
|
|
#define AD193X_ADC_HIGHPASS_FILTER 1
|
|
#define AD193X_ADCL1_MUTE 2
|
|
#define AD193X_ADCR1_MUTE 3
|
|
#define AD193X_ADCL2_MUTE 4
|
|
#define AD193X_ADCR2_MUTE 5
|
|
#define AD193X_ADC_CTRL1 0x80f
|
|
#define AD193X_ADC_SERFMT_MASK 0x60
|
|
#define AD193X_ADC_SERFMT_STEREO (0 << 5)
|
|
#define AD193X_ADC_SERFMT_TDM (1 << 2)
|
|
#define AD193X_ADC_SERFMT_AUX (2 << 5)
|
|
#define AD193X_ADC_WORD_LEN_MASK 0x3
|
|
#define AD193X_ADC_CTRL2 0x810
|
|
#define AD193X_ADC_2_CHANNELS 0
|
|
#define AD193X_ADC_4_CHANNELS 1
|
|
#define AD193X_ADC_8_CHANNELS 2
|
|
#define AD193X_ADC_16_CHANNELS 3
|
|
#define AD193X_ADC_CHAN_SHFT 4
|
|
#define AD193X_ADC_CHAN_MASK (3 << AD193X_ADC_CHAN_SHFT)
|
|
#define AD193X_ADC_LCR_MASTER (1 << 3)
|
|
#define AD193X_ADC_BCLK_MASTER (1 << 6)
|
|
#define AD193X_ADC_LEFT_HIGH (1 << 2)
|
|
#define AD193X_ADC_BCLK_INV (1 << 1)
|
|
|
|
#define AD193X_NUM_REGS 17
|
|
|
|
#endif
|