mirror of
https://github.com/torvalds/linux.git
synced 2024-11-28 07:01:32 +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>
119 lines
3.0 KiB
C
119 lines
3.0 KiB
C
/*
|
|
* wm8753.h -- audio driver for WM8753
|
|
*
|
|
* Copyright 2003 Wolfson Microelectronics PLC.
|
|
* Author: Liam Girdwood <lrg@slimlogic.co.uk>
|
|
*
|
|
* 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.
|
|
*
|
|
*/
|
|
|
|
#ifndef _WM8753_H
|
|
#define _WM8753_H
|
|
|
|
/* WM8753 register space */
|
|
|
|
#define WM8753_DAC 0x01
|
|
#define WM8753_ADC 0x02
|
|
#define WM8753_PCM 0x03
|
|
#define WM8753_HIFI 0x04
|
|
#define WM8753_IOCTL 0x05
|
|
#define WM8753_SRATE1 0x06
|
|
#define WM8753_SRATE2 0x07
|
|
#define WM8753_LDAC 0x08
|
|
#define WM8753_RDAC 0x09
|
|
#define WM8753_BASS 0x0a
|
|
#define WM8753_TREBLE 0x0b
|
|
#define WM8753_ALC1 0x0c
|
|
#define WM8753_ALC2 0x0d
|
|
#define WM8753_ALC3 0x0e
|
|
#define WM8753_NGATE 0x0f
|
|
#define WM8753_LADC 0x10
|
|
#define WM8753_RADC 0x11
|
|
#define WM8753_ADCTL1 0x12
|
|
#define WM8753_3D 0x13
|
|
#define WM8753_PWR1 0x14
|
|
#define WM8753_PWR2 0x15
|
|
#define WM8753_PWR3 0x16
|
|
#define WM8753_PWR4 0x17
|
|
#define WM8753_ID 0x18
|
|
#define WM8753_INTPOL 0x19
|
|
#define WM8753_INTEN 0x1a
|
|
#define WM8753_GPIO1 0x1b
|
|
#define WM8753_GPIO2 0x1c
|
|
#define WM8753_RESET 0x1f
|
|
#define WM8753_RECMIX1 0x20
|
|
#define WM8753_RECMIX2 0x21
|
|
#define WM8753_LOUTM1 0x22
|
|
#define WM8753_LOUTM2 0x23
|
|
#define WM8753_ROUTM1 0x24
|
|
#define WM8753_ROUTM2 0x25
|
|
#define WM8753_MOUTM1 0x26
|
|
#define WM8753_MOUTM2 0x27
|
|
#define WM8753_LOUT1V 0x28
|
|
#define WM8753_ROUT1V 0x29
|
|
#define WM8753_LOUT2V 0x2a
|
|
#define WM8753_ROUT2V 0x2b
|
|
#define WM8753_MOUTV 0x2c
|
|
#define WM8753_OUTCTL 0x2d
|
|
#define WM8753_ADCIN 0x2e
|
|
#define WM8753_INCTL1 0x2f
|
|
#define WM8753_INCTL2 0x30
|
|
#define WM8753_LINVOL 0x31
|
|
#define WM8753_RINVOL 0x32
|
|
#define WM8753_MICBIAS 0x33
|
|
#define WM8753_CLOCK 0x34
|
|
#define WM8753_PLL1CTL1 0x35
|
|
#define WM8753_PLL1CTL2 0x36
|
|
#define WM8753_PLL1CTL3 0x37
|
|
#define WM8753_PLL1CTL4 0x38
|
|
#define WM8753_PLL2CTL1 0x39
|
|
#define WM8753_PLL2CTL2 0x3a
|
|
#define WM8753_PLL2CTL3 0x3b
|
|
#define WM8753_PLL2CTL4 0x3c
|
|
#define WM8753_BIASCTL 0x3d
|
|
#define WM8753_ADCTL2 0x3f
|
|
|
|
#define WM8753_PLL1 0
|
|
#define WM8753_PLL2 1
|
|
|
|
/* clock inputs */
|
|
#define WM8753_MCLK 0
|
|
#define WM8753_PCMCLK 1
|
|
|
|
/* clock divider id's */
|
|
#define WM8753_PCMDIV 0
|
|
#define WM8753_BCLKDIV 1
|
|
#define WM8753_VXCLKDIV 2
|
|
|
|
/* PCM clock dividers */
|
|
#define WM8753_PCM_DIV_1 (0 << 6)
|
|
#define WM8753_PCM_DIV_3 (2 << 6)
|
|
#define WM8753_PCM_DIV_5_5 (3 << 6)
|
|
#define WM8753_PCM_DIV_2 (4 << 6)
|
|
#define WM8753_PCM_DIV_4 (5 << 6)
|
|
#define WM8753_PCM_DIV_6 (6 << 6)
|
|
#define WM8753_PCM_DIV_8 (7 << 6)
|
|
|
|
/* BCLK clock dividers */
|
|
#define WM8753_BCLK_DIV_1 (0 << 3)
|
|
#define WM8753_BCLK_DIV_2 (1 << 3)
|
|
#define WM8753_BCLK_DIV_4 (2 << 3)
|
|
#define WM8753_BCLK_DIV_8 (3 << 3)
|
|
#define WM8753_BCLK_DIV_16 (4 << 3)
|
|
|
|
/* VXCLK clock dividers */
|
|
#define WM8753_VXCLK_DIV_1 (0 << 6)
|
|
#define WM8753_VXCLK_DIV_2 (1 << 6)
|
|
#define WM8753_VXCLK_DIV_4 (2 << 6)
|
|
#define WM8753_VXCLK_DIV_8 (3 << 6)
|
|
#define WM8753_VXCLK_DIV_16 (4 << 6)
|
|
|
|
#define WM8753_DAI_HIFI 0
|
|
#define WM8753_DAI_VOICE 1
|
|
|
|
#endif
|