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>
157 lines
7.3 KiB
C
157 lines
7.3 KiB
C
/*
|
|
* wm8523.h -- WM8423 ASoC driver
|
|
*
|
|
* Copyright 2009 Wolfson Microelectronics, plc
|
|
*
|
|
* Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
|
|
*
|
|
* Based on wm8753.h
|
|
*
|
|
* 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 _WM8523_H
|
|
#define _WM8523_H
|
|
|
|
/*
|
|
* Register values.
|
|
*/
|
|
#define WM8523_DEVICE_ID 0x00
|
|
#define WM8523_REVISION 0x01
|
|
#define WM8523_PSCTRL1 0x02
|
|
#define WM8523_AIF_CTRL1 0x03
|
|
#define WM8523_AIF_CTRL2 0x04
|
|
#define WM8523_DAC_CTRL3 0x05
|
|
#define WM8523_DAC_GAINL 0x06
|
|
#define WM8523_DAC_GAINR 0x07
|
|
#define WM8523_ZERO_DETECT 0x08
|
|
|
|
#define WM8523_REGISTER_COUNT 9
|
|
#define WM8523_MAX_REGISTER 0x08
|
|
|
|
/*
|
|
* Field Definitions.
|
|
*/
|
|
|
|
/*
|
|
* R0 (0x00) - DEVICE_ID
|
|
*/
|
|
#define WM8523_CHIP_ID_MASK 0xFFFF /* CHIP_ID - [15:0] */
|
|
#define WM8523_CHIP_ID_SHIFT 0 /* CHIP_ID - [15:0] */
|
|
#define WM8523_CHIP_ID_WIDTH 16 /* CHIP_ID - [15:0] */
|
|
|
|
/*
|
|
* R1 (0x01) - REVISION
|
|
*/
|
|
#define WM8523_CHIP_REV_MASK 0x0007 /* CHIP_REV - [2:0] */
|
|
#define WM8523_CHIP_REV_SHIFT 0 /* CHIP_REV - [2:0] */
|
|
#define WM8523_CHIP_REV_WIDTH 3 /* CHIP_REV - [2:0] */
|
|
|
|
/*
|
|
* R2 (0x02) - PSCTRL1
|
|
*/
|
|
#define WM8523_SYS_ENA_MASK 0x0003 /* SYS_ENA - [1:0] */
|
|
#define WM8523_SYS_ENA_SHIFT 0 /* SYS_ENA - [1:0] */
|
|
#define WM8523_SYS_ENA_WIDTH 2 /* SYS_ENA - [1:0] */
|
|
|
|
/*
|
|
* R3 (0x03) - AIF_CTRL1
|
|
*/
|
|
#define WM8523_TDM_MODE_MASK 0x1800 /* TDM_MODE - [12:11] */
|
|
#define WM8523_TDM_MODE_SHIFT 11 /* TDM_MODE - [12:11] */
|
|
#define WM8523_TDM_MODE_WIDTH 2 /* TDM_MODE - [12:11] */
|
|
#define WM8523_TDM_SLOT_MASK 0x0600 /* TDM_SLOT - [10:9] */
|
|
#define WM8523_TDM_SLOT_SHIFT 9 /* TDM_SLOT - [10:9] */
|
|
#define WM8523_TDM_SLOT_WIDTH 2 /* TDM_SLOT - [10:9] */
|
|
#define WM8523_DEEMPH 0x0100 /* DEEMPH */
|
|
#define WM8523_DEEMPH_MASK 0x0100 /* DEEMPH */
|
|
#define WM8523_DEEMPH_SHIFT 8 /* DEEMPH */
|
|
#define WM8523_DEEMPH_WIDTH 1 /* DEEMPH */
|
|
#define WM8523_AIF_MSTR 0x0080 /* AIF_MSTR */
|
|
#define WM8523_AIF_MSTR_MASK 0x0080 /* AIF_MSTR */
|
|
#define WM8523_AIF_MSTR_SHIFT 7 /* AIF_MSTR */
|
|
#define WM8523_AIF_MSTR_WIDTH 1 /* AIF_MSTR */
|
|
#define WM8523_LRCLK_INV 0x0040 /* LRCLK_INV */
|
|
#define WM8523_LRCLK_INV_MASK 0x0040 /* LRCLK_INV */
|
|
#define WM8523_LRCLK_INV_SHIFT 6 /* LRCLK_INV */
|
|
#define WM8523_LRCLK_INV_WIDTH 1 /* LRCLK_INV */
|
|
#define WM8523_BCLK_INV 0x0020 /* BCLK_INV */
|
|
#define WM8523_BCLK_INV_MASK 0x0020 /* BCLK_INV */
|
|
#define WM8523_BCLK_INV_SHIFT 5 /* BCLK_INV */
|
|
#define WM8523_BCLK_INV_WIDTH 1 /* BCLK_INV */
|
|
#define WM8523_WL_MASK 0x0018 /* WL - [4:3] */
|
|
#define WM8523_WL_SHIFT 3 /* WL - [4:3] */
|
|
#define WM8523_WL_WIDTH 2 /* WL - [4:3] */
|
|
#define WM8523_FMT_MASK 0x0007 /* FMT - [2:0] */
|
|
#define WM8523_FMT_SHIFT 0 /* FMT - [2:0] */
|
|
#define WM8523_FMT_WIDTH 3 /* FMT - [2:0] */
|
|
|
|
/*
|
|
* R4 (0x04) - AIF_CTRL2
|
|
*/
|
|
#define WM8523_DAC_OP_MUX_MASK 0x00C0 /* DAC_OP_MUX - [7:6] */
|
|
#define WM8523_DAC_OP_MUX_SHIFT 6 /* DAC_OP_MUX - [7:6] */
|
|
#define WM8523_DAC_OP_MUX_WIDTH 2 /* DAC_OP_MUX - [7:6] */
|
|
#define WM8523_BCLKDIV_MASK 0x0038 /* BCLKDIV - [5:3] */
|
|
#define WM8523_BCLKDIV_SHIFT 3 /* BCLKDIV - [5:3] */
|
|
#define WM8523_BCLKDIV_WIDTH 3 /* BCLKDIV - [5:3] */
|
|
#define WM8523_SR_MASK 0x0007 /* SR - [2:0] */
|
|
#define WM8523_SR_SHIFT 0 /* SR - [2:0] */
|
|
#define WM8523_SR_WIDTH 3 /* SR - [2:0] */
|
|
|
|
/*
|
|
* R5 (0x05) - DAC_CTRL3
|
|
*/
|
|
#define WM8523_ZC 0x0010 /* ZC */
|
|
#define WM8523_ZC_MASK 0x0010 /* ZC */
|
|
#define WM8523_ZC_SHIFT 4 /* ZC */
|
|
#define WM8523_ZC_WIDTH 1 /* ZC */
|
|
#define WM8523_DACR 0x0008 /* DACR */
|
|
#define WM8523_DACR_MASK 0x0008 /* DACR */
|
|
#define WM8523_DACR_SHIFT 3 /* DACR */
|
|
#define WM8523_DACR_WIDTH 1 /* DACR */
|
|
#define WM8523_DACL 0x0004 /* DACL */
|
|
#define WM8523_DACL_MASK 0x0004 /* DACL */
|
|
#define WM8523_DACL_SHIFT 2 /* DACL */
|
|
#define WM8523_DACL_WIDTH 1 /* DACL */
|
|
#define WM8523_VOL_UP_RAMP 0x0002 /* VOL_UP_RAMP */
|
|
#define WM8523_VOL_UP_RAMP_MASK 0x0002 /* VOL_UP_RAMP */
|
|
#define WM8523_VOL_UP_RAMP_SHIFT 1 /* VOL_UP_RAMP */
|
|
#define WM8523_VOL_UP_RAMP_WIDTH 1 /* VOL_UP_RAMP */
|
|
#define WM8523_VOL_DOWN_RAMP 0x0001 /* VOL_DOWN_RAMP */
|
|
#define WM8523_VOL_DOWN_RAMP_MASK 0x0001 /* VOL_DOWN_RAMP */
|
|
#define WM8523_VOL_DOWN_RAMP_SHIFT 0 /* VOL_DOWN_RAMP */
|
|
#define WM8523_VOL_DOWN_RAMP_WIDTH 1 /* VOL_DOWN_RAMP */
|
|
|
|
/*
|
|
* R6 (0x06) - DAC_GAINL
|
|
*/
|
|
#define WM8523_DACL_VU 0x0200 /* DACL_VU */
|
|
#define WM8523_DACL_VU_MASK 0x0200 /* DACL_VU */
|
|
#define WM8523_DACL_VU_SHIFT 9 /* DACL_VU */
|
|
#define WM8523_DACL_VU_WIDTH 1 /* DACL_VU */
|
|
#define WM8523_DACL_VOL_MASK 0x01FF /* DACL_VOL - [8:0] */
|
|
#define WM8523_DACL_VOL_SHIFT 0 /* DACL_VOL - [8:0] */
|
|
#define WM8523_DACL_VOL_WIDTH 9 /* DACL_VOL - [8:0] */
|
|
|
|
/*
|
|
* R7 (0x07) - DAC_GAINR
|
|
*/
|
|
#define WM8523_DACR_VU 0x0200 /* DACR_VU */
|
|
#define WM8523_DACR_VU_MASK 0x0200 /* DACR_VU */
|
|
#define WM8523_DACR_VU_SHIFT 9 /* DACR_VU */
|
|
#define WM8523_DACR_VU_WIDTH 1 /* DACR_VU */
|
|
#define WM8523_DACR_VOL_MASK 0x01FF /* DACR_VOL - [8:0] */
|
|
#define WM8523_DACR_VOL_SHIFT 0 /* DACR_VOL - [8:0] */
|
|
#define WM8523_DACR_VOL_WIDTH 9 /* DACR_VOL - [8:0] */
|
|
|
|
/*
|
|
* R8 (0x08) - ZERO_DETECT
|
|
*/
|
|
#define WM8523_ZD_COUNT_MASK 0x0003 /* ZD_COUNT - [1:0] */
|
|
#define WM8523_ZD_COUNT_SHIFT 0 /* ZD_COUNT - [1:0] */
|
|
#define WM8523_ZD_COUNT_WIDTH 2 /* ZD_COUNT - [1:0] */
|
|
|
|
#endif
|