mirror of
https://github.com/torvalds/linux.git
synced 2024-12-22 10:56:40 +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>
114 lines
2.7 KiB
C
114 lines
2.7 KiB
C
/*
|
|
* Copyright (c) 2010 Nuvoton technology corporation.
|
|
*
|
|
* Wan ZongShun <mcuos.com@gmail.com>
|
|
*
|
|
* 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;version 2 of the License.
|
|
*
|
|
*/
|
|
|
|
#ifndef _NUC900_AUDIO_H
|
|
#define _NUC900_AUDIO_H
|
|
|
|
#include <linux/io.h>
|
|
|
|
/* Audio Control Registers */
|
|
#define ACTL_CON 0x00
|
|
#define ACTL_RESET 0x04
|
|
#define ACTL_RDSTB 0x08
|
|
#define ACTL_RDST_LENGTH 0x0C
|
|
#define ACTL_RDSTC 0x10
|
|
#define ACTL_RSR 0x14
|
|
#define ACTL_PDSTB 0x18
|
|
#define ACTL_PDST_LENGTH 0x1C
|
|
#define ACTL_PDSTC 0x20
|
|
#define ACTL_PSR 0x24
|
|
#define ACTL_IISCON 0x28
|
|
#define ACTL_ACCON 0x2C
|
|
#define ACTL_ACOS0 0x30
|
|
#define ACTL_ACOS1 0x34
|
|
#define ACTL_ACOS2 0x38
|
|
#define ACTL_ACIS0 0x3C
|
|
#define ACTL_ACIS1 0x40
|
|
#define ACTL_ACIS2 0x44
|
|
#define ACTL_COUNTER 0x48
|
|
|
|
/* bit definition of REG_ACTL_CON register */
|
|
#define R_DMA_IRQ 0x1000
|
|
#define T_DMA_IRQ 0x0800
|
|
#define IIS_AC_PIN_SEL 0x0100
|
|
#define FIFO_TH 0x0080
|
|
#define ADC_EN 0x0010
|
|
#define M80_EN 0x0008
|
|
#define ACLINK_EN 0x0004
|
|
#define IIS_EN 0x0002
|
|
|
|
/* bit definition of REG_ACTL_RESET register */
|
|
#define W5691_PLAY 0x20000
|
|
#define ACTL_RESET_BIT 0x10000
|
|
#define RECORD_RIGHT_CHNNEL 0x08000
|
|
#define RECORD_LEFT_CHNNEL 0x04000
|
|
#define PLAY_RIGHT_CHNNEL 0x02000
|
|
#define PLAY_LEFT_CHNNEL 0x01000
|
|
#define DAC_PLAY 0x00800
|
|
#define ADC_RECORD 0x00400
|
|
#define M80_PLAY 0x00200
|
|
#define AC_RECORD 0x00100
|
|
#define AC_PLAY 0x00080
|
|
#define IIS_RECORD 0x00040
|
|
#define IIS_PLAY 0x00020
|
|
#define DAC_RESET 0x00010
|
|
#define ADC_RESET 0x00008
|
|
#define M80_RESET 0x00004
|
|
#define AC_RESET 0x00002
|
|
#define IIS_RESET 0x00001
|
|
|
|
/* bit definition of REG_ACTL_ACCON register */
|
|
#define AC_BCLK_PU_EN 0x20
|
|
#define AC_R_FINISH 0x10
|
|
#define AC_W_FINISH 0x08
|
|
#define AC_W_RES 0x04
|
|
#define AC_C_RES 0x02
|
|
|
|
/* bit definition of ACTL_RSR register */
|
|
#define R_FIFO_EMPTY 0x04
|
|
#define R_DMA_END_IRQ 0x02
|
|
#define R_DMA_MIDDLE_IRQ 0x01
|
|
|
|
/* bit definition of ACTL_PSR register */
|
|
#define P_FIFO_EMPTY 0x04
|
|
#define P_DMA_END_IRQ 0x02
|
|
#define P_DMA_MIDDLE_IRQ 0x01
|
|
|
|
/* bit definition of ACTL_ACOS0 register */
|
|
#define SLOT1_VALID 0x01
|
|
#define SLOT2_VALID 0x02
|
|
#define SLOT3_VALID 0x04
|
|
#define SLOT4_VALID 0x08
|
|
#define VALID_FRAME 0x10
|
|
|
|
/* bit definition of ACTL_ACOS1 register */
|
|
#define R_WB 0x80
|
|
|
|
#define CODEC_READY 0x10
|
|
#define RESET_PRSR 0x00
|
|
#define AUDIO_WRITE(addr, val) __raw_writel(val, addr)
|
|
#define AUDIO_READ(addr) __raw_readl(addr)
|
|
|
|
struct nuc900_audio {
|
|
void __iomem *mmio;
|
|
spinlock_t lock;
|
|
dma_addr_t dma_addr[2];
|
|
unsigned long buffersize[2];
|
|
unsigned long irq_num;
|
|
struct snd_pcm_substream *substream;
|
|
struct resource *res;
|
|
struct clk *clk;
|
|
struct device *dev;
|
|
|
|
};
|
|
|
|
#endif /*end _NUC900_AUDIO_H */
|