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>
121 lines
3.0 KiB
C
121 lines
3.0 KiB
C
#ifndef __SOUND_FSI_H
|
|
#define __SOUND_FSI_H
|
|
|
|
/*
|
|
* Fifo-attached Serial Interface (FSI) support for SH7724
|
|
*
|
|
* Copyright (C) 2009 Renesas Solutions Corp.
|
|
* Kuninori Morimoto <morimoto.kuninori@renesas.com>
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#define FSI_PORT_A 0
|
|
#define FSI_PORT_B 1
|
|
|
|
/* flags format
|
|
|
|
* 0xABCDEEFF
|
|
*
|
|
* A: channel size for TDM (input)
|
|
* B: channel size for TDM (ooutput)
|
|
* C: inversion
|
|
* D: mode
|
|
* E: input format
|
|
* F: output format
|
|
*/
|
|
|
|
#include <linux/clk.h>
|
|
#include <sound/soc.h>
|
|
|
|
/* TDM channel */
|
|
#define SH_FSI_SET_CH_I(x) ((x & 0xF) << 28)
|
|
#define SH_FSI_SET_CH_O(x) ((x & 0xF) << 24)
|
|
|
|
#define SH_FSI_CH_IMASK 0xF0000000
|
|
#define SH_FSI_CH_OMASK 0x0F000000
|
|
#define SH_FSI_GET_CH_I(x) ((x & SH_FSI_CH_IMASK) >> 28)
|
|
#define SH_FSI_GET_CH_O(x) ((x & SH_FSI_CH_OMASK) >> 24)
|
|
|
|
/* clock inversion */
|
|
#define SH_FSI_INVERSION_MASK 0x00F00000
|
|
#define SH_FSI_LRM_INV (1 << 20)
|
|
#define SH_FSI_BRM_INV (1 << 21)
|
|
#define SH_FSI_LRS_INV (1 << 22)
|
|
#define SH_FSI_BRS_INV (1 << 23)
|
|
|
|
/* mode */
|
|
#define SH_FSI_MODE_MASK 0x000F0000
|
|
#define SH_FSI_IN_SLAVE_MODE (1 << 16) /* default master mode */
|
|
#define SH_FSI_OUT_SLAVE_MODE (1 << 17) /* default master mode */
|
|
|
|
/* DI format */
|
|
#define SH_FSI_FMT_MASK 0x000000FF
|
|
#define SH_FSI_IFMT(x) (((SH_FSI_FMT_ ## x) & SH_FSI_FMT_MASK) << 8)
|
|
#define SH_FSI_OFMT(x) (((SH_FSI_FMT_ ## x) & SH_FSI_FMT_MASK) << 0)
|
|
#define SH_FSI_GET_IFMT(x) ((x >> 8) & SH_FSI_FMT_MASK)
|
|
#define SH_FSI_GET_OFMT(x) ((x >> 0) & SH_FSI_FMT_MASK)
|
|
|
|
#define SH_FSI_FMT_MONO 0
|
|
#define SH_FSI_FMT_MONO_DELAY 1
|
|
#define SH_FSI_FMT_PCM 2
|
|
#define SH_FSI_FMT_I2S 3
|
|
#define SH_FSI_FMT_TDM 4
|
|
#define SH_FSI_FMT_TDM_DELAY 5
|
|
#define SH_FSI_FMT_SPDIF 6
|
|
|
|
|
|
#define SH_FSI_IFMT_TDM_CH(x) \
|
|
(SH_FSI_IFMT(TDM) | SH_FSI_SET_CH_I(x))
|
|
#define SH_FSI_IFMT_TDM_DELAY_CH(x) \
|
|
(SH_FSI_IFMT(TDM_DELAY) | SH_FSI_SET_CH_I(x))
|
|
|
|
#define SH_FSI_OFMT_TDM_CH(x) \
|
|
(SH_FSI_OFMT(TDM) | SH_FSI_SET_CH_O(x))
|
|
#define SH_FSI_OFMT_TDM_DELAY_CH(x) \
|
|
(SH_FSI_OFMT(TDM_DELAY) | SH_FSI_SET_CH_O(x))
|
|
|
|
|
|
/*
|
|
* set_rate return value
|
|
*
|
|
* see ACKMD/BPFMD on
|
|
* ACK_MD (FSI2)
|
|
* CKG1 (FSI)
|
|
*
|
|
* err: return value < 0
|
|
*
|
|
* 0x-00000AB
|
|
*
|
|
* A: ACKMD value
|
|
* B: BPFMD value
|
|
*/
|
|
|
|
#define SH_FSI_ACKMD_MASK (0xF << 0)
|
|
#define SH_FSI_ACKMD_512 (1 << 0)
|
|
#define SH_FSI_ACKMD_256 (2 << 0)
|
|
#define SH_FSI_ACKMD_128 (3 << 0)
|
|
#define SH_FSI_ACKMD_64 (4 << 0)
|
|
#define SH_FSI_ACKMD_32 (5 << 0)
|
|
|
|
#define SH_FSI_BPFMD_MASK (0xF << 4)
|
|
#define SH_FSI_BPFMD_512 (1 << 4)
|
|
#define SH_FSI_BPFMD_256 (2 << 4)
|
|
#define SH_FSI_BPFMD_128 (3 << 4)
|
|
#define SH_FSI_BPFMD_64 (4 << 4)
|
|
#define SH_FSI_BPFMD_32 (5 << 4)
|
|
#define SH_FSI_BPFMD_16 (6 << 4)
|
|
|
|
struct sh_fsi_platform_info {
|
|
unsigned long porta_flags;
|
|
unsigned long portb_flags;
|
|
int (*set_rate)(int is_porta, int rate); /* for master mode */
|
|
};
|
|
|
|
extern struct snd_soc_dai_driver fsi_soc_dai[2];
|
|
extern struct snd_soc_platform_driver fsi_soc_platform;
|
|
|
|
#endif /* __SOUND_FSI_H */
|