mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-15 05:11:32 +00:00
ALSA: asoc: sh - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
This patch merges struct snd_soc_codec_dai and struct snd_soc_cpu_dai into struct snd_soc_dai for the SuperH platform. Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
parent
1992a6fbd9
commit
53640650ff
@ -326,7 +326,7 @@ static void camelot_pcm_free(struct snd_pcm *pcm)
|
||||
}
|
||||
|
||||
static int camelot_pcm_new(struct snd_card *card,
|
||||
struct snd_soc_codec_dai *dai,
|
||||
struct snd_soc_dai *dai,
|
||||
struct snd_pcm *pcm)
|
||||
{
|
||||
/* dont use SNDRV_DMA_TYPE_DEV, since it will oops the SH kernel
|
||||
|
@ -266,7 +266,7 @@ static int hac_hw_params(struct snd_pcm_substream *substream,
|
||||
#define AC97_FMTS \
|
||||
SNDRV_PCM_FMTBIT_S16_LE
|
||||
|
||||
struct snd_soc_cpu_dai sh4_hac_dai[] = {
|
||||
struct snd_soc_dai sh4_hac_dai[] = {
|
||||
{
|
||||
.name = "HAC0",
|
||||
.id = 0,
|
||||
|
@ -20,7 +20,7 @@
|
||||
#define IPSEL 0xFE400034
|
||||
|
||||
/* platform specific structs can be declared here */
|
||||
extern struct snd_soc_cpu_dai sh4_hac_dai[2];
|
||||
extern struct snd_soc_dai sh4_hac_dai[2];
|
||||
extern struct snd_soc_platform sh7760_soc_platform;
|
||||
|
||||
static int machine_init(struct snd_soc_codec *codec)
|
||||
|
@ -208,7 +208,7 @@ static int ssi_hw_params(struct snd_pcm_substream *substream,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ssi_set_sysclk(struct snd_soc_cpu_dai *cpu_dai, int clk_id,
|
||||
static int ssi_set_sysclk(struct snd_soc_dai *cpu_dai, int clk_id,
|
||||
unsigned int freq, int dir)
|
||||
{
|
||||
struct ssi_priv *ssi = &ssi_cpu_data[cpu_dai->id];
|
||||
@ -222,7 +222,7 @@ static int ssi_set_sysclk(struct snd_soc_cpu_dai *cpu_dai, int clk_id,
|
||||
* This divider is used to generate the SSI_SCK (I2S bitclock) from the
|
||||
* clock at the HAC_BIT_CLK ("oversampling clock") pin.
|
||||
*/
|
||||
static int ssi_set_clkdiv(struct snd_soc_cpu_dai *dai, int did, int div)
|
||||
static int ssi_set_clkdiv(struct snd_soc_dai *dai, int did, int div)
|
||||
{
|
||||
struct ssi_priv *ssi = &ssi_cpu_data[dai->id];
|
||||
unsigned long ssicr;
|
||||
@ -245,7 +245,7 @@ static int ssi_set_clkdiv(struct snd_soc_cpu_dai *dai, int did, int div)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ssi_set_fmt(struct snd_soc_cpu_dai *dai, unsigned int fmt)
|
||||
static int ssi_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
|
||||
{
|
||||
struct ssi_priv *ssi = &ssi_cpu_data[dai->id];
|
||||
unsigned long ssicr = SSIREG(SSICR);
|
||||
@ -332,7 +332,7 @@ static int ssi_set_fmt(struct snd_soc_cpu_dai *dai, unsigned int fmt)
|
||||
SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_U24_3LE | \
|
||||
SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_U32_LE)
|
||||
|
||||
struct snd_soc_cpu_dai sh4_ssi_dai[] = {
|
||||
struct snd_soc_dai sh4_ssi_dai[] = {
|
||||
{
|
||||
.name = "SSI0",
|
||||
.id = 0,
|
||||
|
Loading…
Reference in New Issue
Block a user