mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-31 08:28:13 +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>
119 lines
3.8 KiB
C
119 lines
3.8 KiB
C
/*
|
|
* ALSA SoC TLV320AIC23 codec driver
|
|
*
|
|
* Author: Arun KS, <arunks@mistralsolutions.com>
|
|
* Copyright: (C) 2008 Mistral Solutions Pvt Ltd
|
|
*
|
|
* 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 _TLV320AIC23_H
|
|
#define _TLV320AIC23_H
|
|
|
|
/* Codec TLV320AIC23 */
|
|
#define TLV320AIC23_LINVOL 0x00
|
|
#define TLV320AIC23_RINVOL 0x01
|
|
#define TLV320AIC23_LCHNVOL 0x02
|
|
#define TLV320AIC23_RCHNVOL 0x03
|
|
#define TLV320AIC23_ANLG 0x04
|
|
#define TLV320AIC23_DIGT 0x05
|
|
#define TLV320AIC23_PWR 0x06
|
|
#define TLV320AIC23_DIGT_FMT 0x07
|
|
#define TLV320AIC23_SRATE 0x08
|
|
#define TLV320AIC23_ACTIVE 0x09
|
|
#define TLV320AIC23_RESET 0x0F
|
|
|
|
/* Left (right) line input volume control register */
|
|
#define TLV320AIC23_LRS_ENABLED 0x0100
|
|
#define TLV320AIC23_LIM_MUTED 0x0080
|
|
#define TLV320AIC23_LIV_DEFAULT 0x0017
|
|
#define TLV320AIC23_LIV_MAX 0x001f
|
|
#define TLV320AIC23_LIV_MIN 0x0000
|
|
|
|
/* Left (right) channel headphone volume control register */
|
|
#define TLV320AIC23_LZC_ON 0x0080
|
|
#define TLV320AIC23_LHV_DEFAULT 0x0079
|
|
#define TLV320AIC23_LHV_MAX 0x007f
|
|
#define TLV320AIC23_LHV_MIN 0x0000
|
|
|
|
/* Analog audio path control register */
|
|
#define TLV320AIC23_STA_REG(x) ((x)<<6)
|
|
#define TLV320AIC23_STE_ENABLED 0x0020
|
|
#define TLV320AIC23_DAC_SELECTED 0x0010
|
|
#define TLV320AIC23_BYPASS_ON 0x0008
|
|
#define TLV320AIC23_INSEL_MIC 0x0004
|
|
#define TLV320AIC23_MICM_MUTED 0x0002
|
|
#define TLV320AIC23_MICB_20DB 0x0001
|
|
|
|
/* Digital audio path control register */
|
|
#define TLV320AIC23_DACM_MUTE 0x0008
|
|
#define TLV320AIC23_DEEMP_32K 0x0002
|
|
#define TLV320AIC23_DEEMP_44K 0x0004
|
|
#define TLV320AIC23_DEEMP_48K 0x0006
|
|
#define TLV320AIC23_ADCHP_ON 0x0001
|
|
|
|
/* Power control down register */
|
|
#define TLV320AIC23_DEVICE_PWR_OFF 0x0080
|
|
#define TLV320AIC23_CLK_OFF 0x0040
|
|
#define TLV320AIC23_OSC_OFF 0x0020
|
|
#define TLV320AIC23_OUT_OFF 0x0010
|
|
#define TLV320AIC23_DAC_OFF 0x0008
|
|
#define TLV320AIC23_ADC_OFF 0x0004
|
|
#define TLV320AIC23_MIC_OFF 0x0002
|
|
#define TLV320AIC23_LINE_OFF 0x0001
|
|
|
|
/* Digital audio interface register */
|
|
#define TLV320AIC23_MS_MASTER 0x0040
|
|
#define TLV320AIC23_LRSWAP_ON 0x0020
|
|
#define TLV320AIC23_LRP_ON 0x0010
|
|
#define TLV320AIC23_IWL_16 0x0000
|
|
#define TLV320AIC23_IWL_20 0x0004
|
|
#define TLV320AIC23_IWL_24 0x0008
|
|
#define TLV320AIC23_IWL_32 0x000C
|
|
#define TLV320AIC23_FOR_I2S 0x0002
|
|
#define TLV320AIC23_FOR_DSP 0x0003
|
|
#define TLV320AIC23_FOR_LJUST 0x0001
|
|
|
|
/* Sample rate control register */
|
|
#define TLV320AIC23_CLKOUT_HALF 0x0080
|
|
#define TLV320AIC23_CLKIN_HALF 0x0040
|
|
#define TLV320AIC23_BOSR_384fs 0x0002 /* BOSR_272fs in USB mode */
|
|
#define TLV320AIC23_USB_CLK_ON 0x0001
|
|
#define TLV320AIC23_SR_MASK 0xf
|
|
#define TLV320AIC23_CLKOUT_SHIFT 7
|
|
#define TLV320AIC23_CLKIN_SHIFT 6
|
|
#define TLV320AIC23_SR_SHIFT 2
|
|
#define TLV320AIC23_BOSR_SHIFT 1
|
|
|
|
/* Digital interface register */
|
|
#define TLV320AIC23_ACT_ON 0x0001
|
|
|
|
/*
|
|
* AUDIO related MACROS
|
|
*/
|
|
|
|
#define TLV320AIC23_DEFAULT_OUT_VOL 0x70
|
|
#define TLV320AIC23_DEFAULT_IN_VOLUME 0x10
|
|
|
|
#define TLV320AIC23_OUT_VOL_MIN TLV320AIC23_LHV_MIN
|
|
#define TLV320AIC23_OUT_VOL_MAX TLV320AIC23_LHV_MAX
|
|
#define TLV320AIC23_OUT_VO_RANGE (TLV320AIC23_OUT_VOL_MAX - \
|
|
TLV320AIC23_OUT_VOL_MIN)
|
|
#define TLV320AIC23_OUT_VOL_MASK TLV320AIC23_OUT_VOL_MAX
|
|
|
|
#define TLV320AIC23_IN_VOL_MIN TLV320AIC23_LIV_MIN
|
|
#define TLV320AIC23_IN_VOL_MAX TLV320AIC23_LIV_MAX
|
|
#define TLV320AIC23_IN_VOL_RANGE (TLV320AIC23_IN_VOL_MAX - \
|
|
TLV320AIC23_IN_VOL_MIN)
|
|
#define TLV320AIC23_IN_VOL_MASK TLV320AIC23_IN_VOL_MAX
|
|
|
|
#define TLV320AIC23_SIDETONE_MASK 0x1c0
|
|
#define TLV320AIC23_SIDETONE_0 0x100
|
|
#define TLV320AIC23_SIDETONE_6 0x000
|
|
#define TLV320AIC23_SIDETONE_9 0x040
|
|
#define TLV320AIC23_SIDETONE_12 0x080
|
|
#define TLV320AIC23_SIDETONE_18 0x0c0
|
|
|
|
#endif /* _TLV320AIC23_H */
|