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>
120 lines
3.1 KiB
C
120 lines
3.1 KiB
C
/*
|
|
* atmel_ssc_dai.h - ALSA SSC interface for the Atmel SoC
|
|
*
|
|
* Copyright (C) 2005 SAN People
|
|
* Copyright (C) 2008 Atmel
|
|
*
|
|
* Author: Sedji Gaouaou <sedji.gaouaou@atmel.com>
|
|
* ATMEL CORP.
|
|
*
|
|
* Based on at91-ssc.c by
|
|
* Frank Mandarino <fmandarino@endrelia.com>
|
|
* Based on pxa2xx Platform drivers by
|
|
* 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.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#ifndef _ATMEL_SSC_DAI_H
|
|
#define _ATMEL_SSC_DAI_H
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/atmel-ssc.h>
|
|
|
|
#include "atmel-pcm.h"
|
|
|
|
/* SSC system clock ids */
|
|
#define ATMEL_SYSCLK_MCK 0 /* SSC uses AT91 MCK as system clock */
|
|
|
|
/* SSC divider ids */
|
|
#define ATMEL_SSC_CMR_DIV 0 /* MCK divider for BCLK */
|
|
#define ATMEL_SSC_TCMR_PERIOD 1 /* BCLK divider for transmit FS */
|
|
#define ATMEL_SSC_RCMR_PERIOD 2 /* BCLK divider for receive FS */
|
|
/*
|
|
* SSC direction masks
|
|
*/
|
|
#define SSC_DIR_MASK_UNUSED 0
|
|
#define SSC_DIR_MASK_PLAYBACK 1
|
|
#define SSC_DIR_MASK_CAPTURE 2
|
|
|
|
/*
|
|
* SSC register values that Atmel left out of <linux/atmel-ssc.h>. These
|
|
* are expected to be used with SSC_BF
|
|
*/
|
|
/* START bit field values */
|
|
#define SSC_START_CONTINUOUS 0
|
|
#define SSC_START_TX_RX 1
|
|
#define SSC_START_LOW_RF 2
|
|
#define SSC_START_HIGH_RF 3
|
|
#define SSC_START_FALLING_RF 4
|
|
#define SSC_START_RISING_RF 5
|
|
#define SSC_START_LEVEL_RF 6
|
|
#define SSC_START_EDGE_RF 7
|
|
#define SSS_START_COMPARE_0 8
|
|
|
|
/* CKI bit field values */
|
|
#define SSC_CKI_FALLING 0
|
|
#define SSC_CKI_RISING 1
|
|
|
|
/* CKO bit field values */
|
|
#define SSC_CKO_NONE 0
|
|
#define SSC_CKO_CONTINUOUS 1
|
|
#define SSC_CKO_TRANSFER 2
|
|
|
|
/* CKS bit field values */
|
|
#define SSC_CKS_DIV 0
|
|
#define SSC_CKS_CLOCK 1
|
|
#define SSC_CKS_PIN 2
|
|
|
|
/* FSEDGE bit field values */
|
|
#define SSC_FSEDGE_POSITIVE 0
|
|
#define SSC_FSEDGE_NEGATIVE 1
|
|
|
|
/* FSOS bit field values */
|
|
#define SSC_FSOS_NONE 0
|
|
#define SSC_FSOS_NEGATIVE 1
|
|
#define SSC_FSOS_POSITIVE 2
|
|
#define SSC_FSOS_LOW 3
|
|
#define SSC_FSOS_HIGH 4
|
|
#define SSC_FSOS_TOGGLE 5
|
|
|
|
#define START_DELAY 1
|
|
|
|
struct atmel_ssc_state {
|
|
u32 ssc_cmr;
|
|
u32 ssc_rcmr;
|
|
u32 ssc_rfmr;
|
|
u32 ssc_tcmr;
|
|
u32 ssc_tfmr;
|
|
u32 ssc_sr;
|
|
u32 ssc_imr;
|
|
};
|
|
|
|
|
|
struct atmel_ssc_info {
|
|
char *name;
|
|
struct ssc_device *ssc;
|
|
spinlock_t lock; /* lock for dir_mask */
|
|
unsigned short dir_mask; /* 0=unused, 1=playback, 2=capture */
|
|
unsigned short initialized; /* true if SSC has been initialized */
|
|
unsigned short daifmt;
|
|
unsigned short cmr_div;
|
|
unsigned short tcmr_period;
|
|
unsigned short rcmr_period;
|
|
struct atmel_pcm_dma_params *dma_params[2];
|
|
struct atmel_ssc_state ssc_state;
|
|
};
|
|
|
|
#endif /* _AT91_SSC_DAI_H */
|