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>
88 lines
2.3 KiB
C
88 lines
2.3 KiB
C
/*
|
|
* File: sound/soc/codec/ad73311.h
|
|
* Based on:
|
|
* Author: Cliff Cai <cliff.cai@analog.com>
|
|
*
|
|
* Created: Thur Sep 25, 2008
|
|
* Description: definitions for AD73311 registers
|
|
*
|
|
*
|
|
* Modified:
|
|
* Copyright 2006 Analog Devices Inc.
|
|
*
|
|
* Bugs: Enter bugs at http://blackfin.uclinux.org/
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see the file COPYING, or write
|
|
* to the Free Software Foundation, Inc.,
|
|
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef __AD73311_H__
|
|
#define __AD73311_H__
|
|
|
|
#define AD_CONTROL 0x8000
|
|
#define AD_DATA 0x0000
|
|
#define AD_READ 0x4000
|
|
#define AD_WRITE 0x0000
|
|
|
|
/* Control register A */
|
|
#define CTRL_REG_A (0 << 8)
|
|
|
|
#define REGA_MODE_PRO 0x00
|
|
#define REGA_MODE_DATA 0x01
|
|
#define REGA_MODE_MIXED 0x03
|
|
#define REGA_DLB 0x04
|
|
#define REGA_SLB 0x08
|
|
#define REGA_DEVC(x) ((x & 0x7) << 4)
|
|
#define REGA_RESET 0x80
|
|
|
|
/* Control register B */
|
|
#define CTRL_REG_B (1 << 8)
|
|
|
|
#define REGB_DIRATE(x) (x & 0x3)
|
|
#define REGB_SCDIV(x) ((x & 0x3) << 2)
|
|
#define REGB_MCDIV(x) ((x & 0x7) << 4)
|
|
#define REGB_CEE (1 << 7)
|
|
|
|
/* Control register C */
|
|
#define CTRL_REG_C (2 << 8)
|
|
|
|
#define REGC_PUDEV (1 << 0)
|
|
#define REGC_PUADC (1 << 3)
|
|
#define REGC_PUDAC (1 << 4)
|
|
#define REGC_PUREF (1 << 5)
|
|
#define REGC_REFUSE (1 << 6)
|
|
|
|
/* Control register D */
|
|
#define CTRL_REG_D (3 << 8)
|
|
|
|
#define REGD_IGS(x) (x & 0x7)
|
|
#define REGD_RMOD (1 << 3)
|
|
#define REGD_OGS(x) ((x & 0x7) << 4)
|
|
#define REGD_MUTE (1 << 7)
|
|
|
|
/* Control register E */
|
|
#define CTRL_REG_E (4 << 8)
|
|
|
|
#define REGE_DA(x) (x & 0x1f)
|
|
#define REGE_IBYP (1 << 5)
|
|
|
|
/* Control register F */
|
|
#define CTRL_REG_F (5 << 8)
|
|
|
|
#define REGF_SEEN (1 << 5)
|
|
#define REGF_INV (1 << 6)
|
|
#define REGF_ALB (1 << 7)
|
|
|
|
#endif
|