mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 08:58:07 +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>
76 lines
2.4 KiB
C
76 lines
2.4 KiB
C
/*
|
|
* wm2000.h -- WM2000 Soc Audio driver
|
|
*
|
|
* 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 _WM2000_H
|
|
#define _WM2000_H
|
|
|
|
struct wm2000_setup_data {
|
|
unsigned short i2c_address;
|
|
int mclk_div; /* Set to a non-zero value if MCLK_DIV_2 required */
|
|
};
|
|
|
|
extern int wm2000_add_controls(struct snd_soc_codec *codec);
|
|
|
|
#define WM2000_REG_SYS_START 0x8000
|
|
#define WM2000_REG_SPEECH_CLARITY 0x8fef
|
|
#define WM2000_REG_SYS_WATCHDOG 0x8ff6
|
|
#define WM2000_REG_ANA_VMID_PD_TIME 0x8ff7
|
|
#define WM2000_REG_ANA_VMID_PU_TIME 0x8ff8
|
|
#define WM2000_REG_CAT_FLTR_INDX 0x8ff9
|
|
#define WM2000_REG_CAT_GAIN_0 0x8ffa
|
|
#define WM2000_REG_SYS_STATUS 0x8ffc
|
|
#define WM2000_REG_SYS_MODE_CNTRL 0x8ffd
|
|
#define WM2000_REG_SYS_START0 0x8ffe
|
|
#define WM2000_REG_SYS_START1 0x8fff
|
|
#define WM2000_REG_ID1 0xf000
|
|
#define WM2000_REG_ID2 0xf001
|
|
#define WM2000_REG_REVISON 0xf002
|
|
#define WM2000_REG_SYS_CTL1 0xf003
|
|
#define WM2000_REG_SYS_CTL2 0xf004
|
|
#define WM2000_REG_ANC_STAT 0xf005
|
|
#define WM2000_REG_IF_CTL 0xf006
|
|
|
|
/* SPEECH_CLARITY */
|
|
#define WM2000_SPEECH_CLARITY 0x01
|
|
|
|
/* SYS_STATUS */
|
|
#define WM2000_STATUS_MOUSE_ACTIVE 0x40
|
|
#define WM2000_STATUS_CAT_FREQ_COMPLETE 0x20
|
|
#define WM2000_STATUS_CAT_GAIN_COMPLETE 0x10
|
|
#define WM2000_STATUS_THERMAL_SHUTDOWN_COMPLETE 0x08
|
|
#define WM2000_STATUS_ANC_DISABLED 0x04
|
|
#define WM2000_STATUS_POWER_DOWN_COMPLETE 0x02
|
|
#define WM2000_STATUS_BOOT_COMPLETE 0x01
|
|
|
|
/* SYS_MODE_CNTRL */
|
|
#define WM2000_MODE_ANA_SEQ_INCLUDE 0x80
|
|
#define WM2000_MODE_MOUSE_ENABLE 0x40
|
|
#define WM2000_MODE_CAT_FREQ_ENABLE 0x20
|
|
#define WM2000_MODE_CAT_GAIN_ENABLE 0x10
|
|
#define WM2000_MODE_BYPASS_ENTRY 0x08
|
|
#define WM2000_MODE_STANDBY_ENTRY 0x04
|
|
#define WM2000_MODE_THERMAL_ENABLE 0x02
|
|
#define WM2000_MODE_POWER_DOWN 0x01
|
|
|
|
/* SYS_CTL1 */
|
|
#define WM2000_SYS_STBY 0x01
|
|
|
|
/* SYS_CTL2 */
|
|
#define WM2000_MCLK_DIV2_ENA_CLR 0x80
|
|
#define WM2000_MCLK_DIV2_ENA_SET 0x40
|
|
#define WM2000_ANC_ENG_CLR 0x20
|
|
#define WM2000_ANC_ENG_SET 0x10
|
|
#define WM2000_ANC_INT_N_CLR 0x08
|
|
#define WM2000_ANC_INT_N_SET 0x04
|
|
#define WM2000_RAM_CLR 0x02
|
|
#define WM2000_RAM_SET 0x01
|
|
|
|
/* ANC_STAT */
|
|
#define WM2000_ANC_ENG_IDLE 0x01
|
|
|
|
#endif
|