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>
79 lines
2.1 KiB
C
79 lines
2.1 KiB
C
/*
|
|
* Audio support for Philips UDA1380
|
|
*
|
|
* 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.
|
|
*
|
|
* Copyright (c) 2005 Giorgio Padrin <giorgio@mandarinlogiq.org>
|
|
*/
|
|
|
|
#ifndef _UDA1380_H
|
|
#define _UDA1380_H
|
|
|
|
#define UDA1380_CLK 0x00
|
|
#define UDA1380_IFACE 0x01
|
|
#define UDA1380_PM 0x02
|
|
#define UDA1380_AMIX 0x03
|
|
#define UDA1380_HP 0x04
|
|
#define UDA1380_MVOL 0x10
|
|
#define UDA1380_MIXVOL 0x11
|
|
#define UDA1380_MODE 0x12
|
|
#define UDA1380_DEEMP 0x13
|
|
#define UDA1380_MIXER 0x14
|
|
#define UDA1380_INTSTAT 0x18
|
|
#define UDA1380_DEC 0x20
|
|
#define UDA1380_PGA 0x21
|
|
#define UDA1380_ADC 0x22
|
|
#define UDA1380_AGC 0x23
|
|
#define UDA1380_DECSTAT 0x28
|
|
#define UDA1380_RESET 0x7f
|
|
|
|
#define UDA1380_CACHEREGNUM 0x24
|
|
|
|
/* Register flags */
|
|
#define R00_EN_ADC 0x0800
|
|
#define R00_EN_DEC 0x0400
|
|
#define R00_EN_DAC 0x0200
|
|
#define R00_EN_INT 0x0100
|
|
#define R00_DAC_CLK 0x0010
|
|
#define R01_SFORI_I2S 0x0000
|
|
#define R01_SFORI_LSB16 0x0100
|
|
#define R01_SFORI_LSB18 0x0200
|
|
#define R01_SFORI_LSB20 0x0300
|
|
#define R01_SFORI_MSB 0x0500
|
|
#define R01_SFORI_MASK 0x0700
|
|
#define R01_SFORO_I2S 0x0000
|
|
#define R01_SFORO_LSB16 0x0001
|
|
#define R01_SFORO_LSB18 0x0002
|
|
#define R01_SFORO_LSB20 0x0003
|
|
#define R01_SFORO_LSB24 0x0004
|
|
#define R01_SFORO_MSB 0x0005
|
|
#define R01_SFORO_MASK 0x0007
|
|
#define R01_SEL_SOURCE 0x0040
|
|
#define R01_SIM 0x0010
|
|
#define R02_PON_PLL 0x8000
|
|
#define R02_PON_HP 0x2000
|
|
#define R02_PON_DAC 0x0400
|
|
#define R02_PON_BIAS 0x0100
|
|
#define R02_EN_AVC 0x0080
|
|
#define R02_PON_AVC 0x0040
|
|
#define R02_PON_LNA 0x0010
|
|
#define R02_PON_PGAL 0x0008
|
|
#define R02_PON_ADCL 0x0004
|
|
#define R02_PON_PGAR 0x0002
|
|
#define R02_PON_ADCR 0x0001
|
|
#define R13_MTM 0x4000
|
|
#define R14_SILENCE 0x0080
|
|
#define R14_SDET_ON 0x0040
|
|
#define R21_MT_ADC 0x8000
|
|
#define R22_SEL_LNA 0x0008
|
|
#define R22_SEL_MIC 0x0004
|
|
#define R22_SKIP_DCFIL 0x0002
|
|
#define R23_AGC_EN 0x0001
|
|
|
|
#define UDA1380_DAI_DUPLEX 0 /* playback and capture on single DAI */
|
|
#define UDA1380_DAI_PLAYBACK 1 /* playback DAI */
|
|
#define UDA1380_DAI_CAPTURE 2 /* capture DAI */
|
|
|
|
#endif /* _UDA1380_H */
|