mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 19:41:54 +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>
107 lines
3.2 KiB
C
107 lines
3.2 KiB
C
/* sound/soc/s3c24xx/s3c-i2s-v2.h
|
|
*
|
|
* ALSA Soc Audio Layer - S3C_I2SV2 I2S driver
|
|
*
|
|
* Copyright (c) 2007 Simtec Electronics
|
|
* http://armlinux.simtec.co.uk/
|
|
* Ben Dooks <ben@simtec.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.
|
|
*/
|
|
|
|
/* This code is the core support for the I2S block found in a number of
|
|
* Samsung SoC devices which is unofficially named I2S-V2. Currently the
|
|
* S3C2412 and the S3C64XX series use this block to provide 1 or 2 I2S
|
|
* channels via configurable GPIO.
|
|
*/
|
|
|
|
#ifndef __SND_SOC_S3C24XX_S3C_I2SV2_I2S_H
|
|
#define __SND_SOC_S3C24XX_S3C_I2SV2_I2S_H __FILE__
|
|
|
|
#define S3C_I2SV2_DIV_BCLK (1)
|
|
#define S3C_I2SV2_DIV_RCLK (2)
|
|
#define S3C_I2SV2_DIV_PRESCALER (3)
|
|
|
|
#define S3C_I2SV2_CLKSRC_PCLK 0
|
|
#define S3C_I2SV2_CLKSRC_AUDIOBUS 1
|
|
#define S3C_I2SV2_CLKSRC_CDCLK 2
|
|
|
|
/* Set this flag for I2S controllers that have the bit IISMOD[12]
|
|
* bridge/break RCLK signal and external Xi2sCDCLK pin.
|
|
*/
|
|
#define S3C_FEATURE_CDCLKCON (1 << 0)
|
|
|
|
/**
|
|
* struct s3c_i2sv2_info - S3C I2S-V2 information
|
|
* @dev: The parent device passed to use from the probe.
|
|
* @regs: The pointer to the device registe block.
|
|
* @feature: Set of bit-flags indicating features of the controller.
|
|
* @master: True if the I2S core is the I2S bit clock master.
|
|
* @dma_playback: DMA information for playback channel.
|
|
* @dma_capture: DMA information for capture channel.
|
|
* @suspend_iismod: PM save for the IISMOD register.
|
|
* @suspend_iiscon: PM save for the IISCON register.
|
|
* @suspend_iispsr: PM save for the IISPSR register.
|
|
*
|
|
* This is the private codec state for the hardware associated with an
|
|
* I2S channel such as the register mappings and clock sources.
|
|
*/
|
|
struct s3c_i2sv2_info {
|
|
struct device *dev;
|
|
void __iomem *regs;
|
|
|
|
u32 feature;
|
|
|
|
struct clk *iis_pclk;
|
|
struct clk *iis_cclk;
|
|
|
|
unsigned char master;
|
|
|
|
struct s3c_dma_params *dma_playback;
|
|
struct s3c_dma_params *dma_capture;
|
|
|
|
u32 suspend_iismod;
|
|
u32 suspend_iiscon;
|
|
u32 suspend_iispsr;
|
|
|
|
unsigned long base;
|
|
};
|
|
|
|
extern struct clk *s3c_i2sv2_get_clock(struct snd_soc_dai *cpu_dai);
|
|
|
|
struct s3c_i2sv2_rate_calc {
|
|
unsigned int clk_div; /* for prescaler */
|
|
unsigned int fs_div; /* for root frame clock */
|
|
};
|
|
|
|
extern int s3c_i2sv2_iis_calc_rate(struct s3c_i2sv2_rate_calc *info,
|
|
unsigned int *fstab,
|
|
unsigned int rate, struct clk *clk);
|
|
|
|
/**
|
|
* s3c_i2sv2_probe - probe for i2s device helper
|
|
* @dai: The ASoC DAI structure supplied to the original probe.
|
|
* @i2s: Our local i2s structure to fill in.
|
|
* @base: The base address for the registers.
|
|
*/
|
|
extern int s3c_i2sv2_probe(struct snd_soc_dai *dai,
|
|
struct s3c_i2sv2_info *i2s,
|
|
unsigned long base);
|
|
|
|
/**
|
|
* s3c_i2sv2_register_dai - register dai with soc core
|
|
* @dev: DAI device
|
|
* @id: DAI ID
|
|
* @drv: The driver structure to register
|
|
*
|
|
* Fill in any missing fields and then register the given dai with the
|
|
* soc core.
|
|
*/
|
|
extern int s3c_i2sv2_register_dai(struct device *dev, int id,
|
|
struct snd_soc_dai_driver *drv);
|
|
|
|
#endif /* __SND_SOC_S3C24XX_S3C_I2SV2_I2S_H */
|