mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 00:48:50 +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>
113 lines
2.8 KiB
C
113 lines
2.8 KiB
C
/*
|
|
* wm8960.h -- WM8960 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 _WM8960_H
|
|
#define _WM8960_H
|
|
|
|
/* WM8960 register space */
|
|
|
|
|
|
#define WM8960_CACHEREGNUM 56
|
|
|
|
#define WM8960_LINVOL 0x0
|
|
#define WM8960_RINVOL 0x1
|
|
#define WM8960_LOUT1 0x2
|
|
#define WM8960_ROUT1 0x3
|
|
#define WM8960_CLOCK1 0x4
|
|
#define WM8960_DACCTL1 0x5
|
|
#define WM8960_DACCTL2 0x6
|
|
#define WM8960_IFACE1 0x7
|
|
#define WM8960_CLOCK2 0x8
|
|
#define WM8960_IFACE2 0x9
|
|
#define WM8960_LDAC 0xa
|
|
#define WM8960_RDAC 0xb
|
|
|
|
#define WM8960_RESET 0xf
|
|
#define WM8960_3D 0x10
|
|
#define WM8960_ALC1 0x11
|
|
#define WM8960_ALC2 0x12
|
|
#define WM8960_ALC3 0x13
|
|
#define WM8960_NOISEG 0x14
|
|
#define WM8960_LADC 0x15
|
|
#define WM8960_RADC 0x16
|
|
#define WM8960_ADDCTL1 0x17
|
|
#define WM8960_ADDCTL2 0x18
|
|
#define WM8960_POWER1 0x19
|
|
#define WM8960_POWER2 0x1a
|
|
#define WM8960_ADDCTL3 0x1b
|
|
#define WM8960_APOP1 0x1c
|
|
#define WM8960_APOP2 0x1d
|
|
|
|
#define WM8960_LINPATH 0x20
|
|
#define WM8960_RINPATH 0x21
|
|
#define WM8960_LOUTMIX 0x22
|
|
|
|
#define WM8960_ROUTMIX 0x25
|
|
#define WM8960_MONOMIX1 0x26
|
|
#define WM8960_MONOMIX2 0x27
|
|
#define WM8960_LOUT2 0x28
|
|
#define WM8960_ROUT2 0x29
|
|
#define WM8960_MONO 0x2a
|
|
#define WM8960_INBMIX1 0x2b
|
|
#define WM8960_INBMIX2 0x2c
|
|
#define WM8960_BYPASS1 0x2d
|
|
#define WM8960_BYPASS2 0x2e
|
|
#define WM8960_POWER3 0x2f
|
|
#define WM8960_ADDCTL4 0x30
|
|
#define WM8960_CLASSD1 0x31
|
|
|
|
#define WM8960_CLASSD3 0x33
|
|
#define WM8960_PLL1 0x34
|
|
#define WM8960_PLL2 0x35
|
|
#define WM8960_PLL3 0x36
|
|
#define WM8960_PLL4 0x37
|
|
|
|
|
|
/*
|
|
* WM8960 Clock dividers
|
|
*/
|
|
#define WM8960_SYSCLKDIV 0
|
|
#define WM8960_DACDIV 1
|
|
#define WM8960_OPCLKDIV 2
|
|
#define WM8960_DCLKDIV 3
|
|
#define WM8960_TOCLKSEL 4
|
|
|
|
#define WM8960_SYSCLK_DIV_1 (0 << 1)
|
|
#define WM8960_SYSCLK_DIV_2 (2 << 1)
|
|
|
|
#define WM8960_SYSCLK_MCLK (0 << 0)
|
|
#define WM8960_SYSCLK_PLL (1 << 0)
|
|
|
|
#define WM8960_DAC_DIV_1 (0 << 3)
|
|
#define WM8960_DAC_DIV_1_5 (1 << 3)
|
|
#define WM8960_DAC_DIV_2 (2 << 3)
|
|
#define WM8960_DAC_DIV_3 (3 << 3)
|
|
#define WM8960_DAC_DIV_4 (4 << 3)
|
|
#define WM8960_DAC_DIV_5_5 (5 << 3)
|
|
#define WM8960_DAC_DIV_6 (6 << 3)
|
|
|
|
#define WM8960_DCLK_DIV_1_5 (0 << 6)
|
|
#define WM8960_DCLK_DIV_2 (1 << 6)
|
|
#define WM8960_DCLK_DIV_3 (2 << 6)
|
|
#define WM8960_DCLK_DIV_4 (3 << 6)
|
|
#define WM8960_DCLK_DIV_6 (4 << 6)
|
|
#define WM8960_DCLK_DIV_8 (5 << 6)
|
|
#define WM8960_DCLK_DIV_12 (6 << 6)
|
|
#define WM8960_DCLK_DIV_16 (7 << 6)
|
|
|
|
#define WM8960_TOCLK_F19 (0 << 1)
|
|
#define WM8960_TOCLK_F21 (1 << 1)
|
|
|
|
#define WM8960_OPCLK_DIV_1 (0 << 0)
|
|
#define WM8960_OPCLK_DIV_2 (1 << 0)
|
|
#define WM8960_OPCLK_DIV_3 (2 << 0)
|
|
#define WM8960_OPCLK_DIV_4 (3 << 0)
|
|
#define WM8960_OPCLK_DIV_5_5 (4 << 0)
|
|
#define WM8960_OPCLK_DIV_6 (5 << 0)
|
|
|
|
#endif
|