Skip to content

L
linux
Commit 1992a6fb authored by Liam Girdwood's avatar Liam Girdwood Committed by Jaroslav Kysela
Browse files
Options

ALSA: asoc: s3c24xx - 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 S3C24xx platform.
Signed-off-by: default avatarLiam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 917f93ac
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
sound/soc/s3c24xx/neo1973_wm8753.c
View file @ 1992a6fb
...@@ -66,8 +66,8 @@ static int neo1973_hifi_hw_params(struct snd_pcm_substream *substream, ...@@ -66,8 +66,8 @@ static int neo1973_hifi_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
unsigned int pll_out = 0, bclk = 0; unsigned int pll_out = 0, bclk = 0;
int ret = 0; int ret = 0;
unsigned long iis_clkrate; unsigned long iis_clkrate;
...@@ -156,7 +156,7 @@ static int neo1973_hifi_hw_params(struct snd_pcm_substream *substream, ...@@ -156,7 +156,7 @@ static int neo1973_hifi_hw_params(struct snd_pcm_substream *substream,
static int neo1973_hifi_hw_free(struct snd_pcm_substream *substream) static int neo1973_hifi_hw_free(struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
DBG("Entered %s\n", __func__); DBG("Entered %s\n", __func__);
...@@ -176,7 +176,7 @@ static int neo1973_voice_hw_params(struct snd_pcm_substream *substream, ...@@ -176,7 +176,7 @@ static int neo1973_voice_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
unsigned int pcmdiv = 0; unsigned int pcmdiv = 0;
int ret = 0; int ret = 0;
unsigned long iis_clkrate; unsigned long iis_clkrate;
...@@ -222,7 +222,7 @@ static int neo1973_voice_hw_params(struct snd_pcm_substream *substream, ...@@ -222,7 +222,7 @@ static int neo1973_voice_hw_params(struct snd_pcm_substream *substream,
static int neo1973_voice_hw_free(struct snd_pcm_substream *substream) static int neo1973_voice_hw_free(struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
DBG("Entered %s\n", __func__); DBG("Entered %s\n", __func__);
...@@ -546,7 +546,7 @@ static int neo1973_wm8753_init(struct snd_soc_codec *codec) ...@@ -546,7 +546,7 @@ static int neo1973_wm8753_init(struct snd_soc_codec *codec)
/* /*
* BT Codec DAI * BT Codec DAI
*/ */
static struct snd_soc_cpu_dai bt_dai = { static struct snd_soc_dai bt_dai = {
.name = "Bluetooth", .name = "Bluetooth",
.id = 0, .id = 0,
.type = SND_SOC_DAI_PCM, .type = SND_SOC_DAI_PCM,
......
sound/soc/s3c24xx/s3c2412-i2s.c
View file @ 1992a6fb
...@@ -295,7 +295,7 @@ static inline int s3c2412_snd_is_clkmaster(void) ...@@ -295,7 +295,7 @@ static inline int s3c2412_snd_is_clkmaster(void)
/* /*
* Set S3C2412 I2S DAI format * Set S3C2412 I2S DAI format
*/ */
static int s3c2412_i2s_set_fmt(struct snd_soc_cpu_dai *cpu_dai, static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
unsigned int fmt) unsigned int fmt)
{ {
u32 iismod; u32 iismod;
...@@ -500,7 +500,7 @@ EXPORT_SYMBOL_GPL(s3c2412_iis_calc_rate); ...@@ -500,7 +500,7 @@ EXPORT_SYMBOL_GPL(s3c2412_iis_calc_rate);
/* /*
* Set S3C2412 Clock source * Set S3C2412 Clock source
*/ */
static int s3c2412_i2s_set_sysclk(struct snd_soc_cpu_dai *cpu_dai, static int s3c2412_i2s_set_sysclk(struct snd_soc_dai *cpu_dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
u32 iismod = readl(s3c2412_i2s.regs + S3C2412_IISMOD); u32 iismod = readl(s3c2412_i2s.regs + S3C2412_IISMOD);
...@@ -528,7 +528,7 @@ static int s3c2412_i2s_set_sysclk(struct snd_soc_cpu_dai *cpu_dai, ...@@ -528,7 +528,7 @@ static int s3c2412_i2s_set_sysclk(struct snd_soc_cpu_dai *cpu_dai,
/* /*
* Set S3C2412 Clock dividers * Set S3C2412 Clock dividers
*/ */
static int s3c2412_i2s_set_clkdiv(struct snd_soc_cpu_dai *cpu_dai, static int s3c2412_i2s_set_clkdiv(struct snd_soc_dai *cpu_dai,
int div_id, int div) int div_id, int div)
{ {
struct s3c2412_i2s_info *i2s = &s3c2412_i2s; struct s3c2412_i2s_info *i2s = &s3c2412_i2s;
...@@ -602,7 +602,7 @@ EXPORT_SYMBOL_GPL(s3c2412_get_iisclk); ...@@ -602,7 +602,7 @@ EXPORT_SYMBOL_GPL(s3c2412_get_iisclk);
static int s3c2412_i2s_probe(struct platform_device *pdev, static int s3c2412_i2s_probe(struct platform_device *pdev,
struct snd_soc_cpu_dai *dai) struct snd_soc_dai *dai)
{ {
DBG("Entered %s\n", __func__); DBG("Entered %s\n", __func__);
...@@ -648,7 +648,7 @@ static int s3c2412_i2s_probe(struct platform_device *pdev, ...@@ -648,7 +648,7 @@ static int s3c2412_i2s_probe(struct platform_device *pdev,
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int s3c2412_i2s_suspend(struct platform_device *dev, static int s3c2412_i2s_suspend(struct platform_device *dev,
struct snd_soc_cpu_dai *dai) struct snd_soc_dai *dai)
{ {
struct s3c2412_i2s_info *i2s = &s3c2412_i2s; struct s3c2412_i2s_info *i2s = &s3c2412_i2s;
u32 iismod; u32 iismod;
...@@ -676,7 +676,7 @@ static int s3c2412_i2s_suspend(struct platform_device *dev, ...@@ -676,7 +676,7 @@ static int s3c2412_i2s_suspend(struct platform_device *dev,
} }
static int s3c2412_i2s_resume(struct platform_device *pdev, static int s3c2412_i2s_resume(struct platform_device *pdev,
struct snd_soc_cpu_dai *dai) struct snd_soc_dai *dai)
{ {
struct s3c2412_i2s_info *i2s = &s3c2412_i2s; struct s3c2412_i2s_info *i2s = &s3c2412_i2s;
...@@ -708,7 +708,7 @@ static int s3c2412_i2s_resume(struct platform_device *pdev, ...@@ -708,7 +708,7 @@ static int s3c2412_i2s_resume(struct platform_device *pdev,
SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \ SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
struct snd_soc_cpu_dai s3c2412_i2s_dai = { struct snd_soc_dai s3c2412_i2s_dai = {
.name = "s3c2412-i2s", .name = "s3c2412-i2s",
.id = 0, .id = 0,
.type = SND_SOC_DAI_I2S, .type = SND_SOC_DAI_I2S,
......
sound/soc/s3c24xx/s3c2412-i2s.h
View file @ 1992a6fb
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
extern struct clk *s3c2412_get_iisclk(void); extern struct clk *s3c2412_get_iisclk(void);
extern struct snd_soc_cpu_dai s3c2412_i2s_dai; extern struct snd_soc_dai s3c2412_i2s_dai;
struct s3c2412_rate_calc { struct s3c2412_rate_calc {
unsigned int clk_div; /* for prescaler */ unsigned int clk_div; /* for prescaler */
......
sound/soc/s3c24xx/s3c2443-ac97.c
View file @ 1992a6fb
...@@ -210,7 +210,7 @@ static struct s3c24xx_pcm_dma_params s3c2443_ac97_mic_mono_in = { ...@@ -210,7 +210,7 @@ static struct s3c24xx_pcm_dma_params s3c2443_ac97_mic_mono_in = {
}; };
static int s3c2443_ac97_probe(struct platform_device *pdev, static int s3c2443_ac97_probe(struct platform_device *pdev,
struct snd_soc_cpu_dai *dai) struct snd_soc_dai *dai)
{ {
int ret; int ret;
u32 ac_glbctrl; u32 ac_glbctrl;
...@@ -262,7 +262,7 @@ static int s3c2443_ac97_probe(struct platform_device *pdev, ...@@ -262,7 +262,7 @@ static int s3c2443_ac97_probe(struct platform_device *pdev,
} }
static void s3c2443_ac97_remove(struct platform_device *pdev, static void s3c2443_ac97_remove(struct platform_device *pdev,
struct snd_soc_cpu_dai *dai) struct snd_soc_dai *dai)
{ {
free_irq(IRQ_S3C244x_AC97, NULL); free_irq(IRQ_S3C244x_AC97, NULL);
clk_disable(s3c24xx_ac97.ac97_clk); clk_disable(s3c24xx_ac97.ac97_clk);
...@@ -274,7 +274,7 @@ static int s3c2443_ac97_hw_params(struct snd_pcm_substream *substream, ...@@ -274,7 +274,7 @@ static int s3c2443_ac97_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
cpu_dai->dma_data = &s3c2443_ac97_pcm_stereo_out; cpu_dai->dma_data = &s3c2443_ac97_pcm_stereo_out;
...@@ -316,7 +316,7 @@ static int s3c2443_ac97_hw_mic_params(struct snd_pcm_substream *substream, ...@@ -316,7 +316,7 @@ static int s3c2443_ac97_hw_mic_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
return -ENODEV; return -ENODEV;
...@@ -352,7 +352,7 @@ static int s3c2443_ac97_mic_trigger(struct snd_pcm_substream *substream, ...@@ -352,7 +352,7 @@ static int s3c2443_ac97_mic_trigger(struct snd_pcm_substream *substream,
SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | \ SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | \
SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000) SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
struct snd_soc_cpu_dai s3c2443_ac97_dai[] = { struct snd_soc_dai s3c2443_ac97_dai[] = {
{ {
.name = "s3c2443-ac97", .name = "s3c2443-ac97",
.id = 0, .id = 0,
......
sound/soc/s3c24xx/s3c24xx-ac97.h
View file @ 1992a6fb
...@@ -26,6 +26,6 @@ ...@@ -26,6 +26,6 @@
#define IRQ_S3C244x_AC97 IRQ_S3C2443_AC97 #define IRQ_S3C244x_AC97 IRQ_S3C2443_AC97
#endif #endif
extern struct snd_soc_cpu_dai s3c2443_ac97_dai[]; extern struct snd_soc_dai s3c2443_ac97_dai[];
#endif /*S3C24XXAC97_H_*/ #endif /*S3C24XXAC97_H_*/
sound/soc/s3c24xx/s3c24xx-i2s.c
View file @ 1992a6fb
...@@ -205,7 +205,7 @@ static inline int s3c24xx_snd_is_clkmaster(void) ...@@ -205,7 +205,7 @@ static inline int s3c24xx_snd_is_clkmaster(void)
/* /*
* Set S3C24xx I2S DAI format * Set S3C24xx I2S DAI format
*/ */
static int s3c24xx_i2s_set_fmt(struct snd_soc_cpu_dai *cpu_dai, static int s3c24xx_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
unsigned int fmt) unsigned int fmt)
{ {
u32 iismod; u32 iismod;
...@@ -313,7 +313,7 @@ static int s3c24xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd) ...@@ -313,7 +313,7 @@ static int s3c24xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd)
/* /*
* Set S3C24xx Clock source * Set S3C24xx Clock source
*/ */
static int s3c24xx_i2s_set_sysclk(struct snd_soc_cpu_dai *cpu_dai, static int s3c24xx_i2s_set_sysclk(struct snd_soc_dai *cpu_dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
u32 iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD); u32 iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD);
...@@ -339,7 +339,7 @@ static int s3c24xx_i2s_set_sysclk(struct snd_soc_cpu_dai *cpu_dai, ...@@ -339,7 +339,7 @@ static int s3c24xx_i2s_set_sysclk(struct snd_soc_cpu_dai *cpu_dai,
/* /*
* Set S3C24xx Clock dividers * Set S3C24xx Clock dividers
*/ */
static int s3c24xx_i2s_set_clkdiv(struct snd_soc_cpu_dai *cpu_dai, static int s3c24xx_i2s_set_clkdiv(struct snd_soc_dai *cpu_dai,
int div_id, int div) int div_id, int div)
{ {
u32 reg; u32 reg;
...@@ -378,7 +378,7 @@ u32 s3c24xx_i2s_get_clockrate(void) ...@@ -378,7 +378,7 @@ u32 s3c24xx_i2s_get_clockrate(void)
EXPORT_SYMBOL_GPL(s3c24xx_i2s_get_clockrate); EXPORT_SYMBOL_GPL(s3c24xx_i2s_get_clockrate);
static int s3c24xx_i2s_probe(struct platform_device *pdev, static int s3c24xx_i2s_probe(struct platform_device *pdev,
struct snd_soc_cpu_dai *dai) struct snd_soc_dai *dai)
{ {
DBG("Entered %s\n", __func__); DBG("Entered %s\n", __func__);
...@@ -411,7 +411,7 @@ static int s3c24xx_i2s_probe(struct platform_device *pdev, ...@@ -411,7 +411,7 @@ static int s3c24xx_i2s_probe(struct platform_device *pdev,
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int s3c24xx_i2s_suspend(struct platform_device *pdev, static int s3c24xx_i2s_suspend(struct platform_device *pdev,
struct snd_soc_cpu_dai *cpu_dai) struct snd_soc_dai *cpu_dai)
{ {
DBG("Entered %s\n", __func__); DBG("Entered %s\n", __func__);
...@@ -426,7 +426,7 @@ static int s3c24xx_i2s_suspend(struct platform_device *pdev, ...@@ -426,7 +426,7 @@ static int s3c24xx_i2s_suspend(struct platform_device *pdev,
} }
static int s3c24xx_i2s_resume(struct platform_device *pdev, static int s3c24xx_i2s_resume(struct platform_device *pdev,
struct snd_soc_cpu_dai *cpu_dai) struct snd_soc_dai *cpu_dai)
{ {
DBG("Entered %s\n", __func__); DBG("Entered %s\n", __func__);
clk_enable(s3c24xx_i2s.iis_clk); clk_enable(s3c24xx_i2s.iis_clk);
...@@ -449,7 +449,7 @@ static int s3c24xx_i2s_resume(struct platform_device *pdev, ...@@ -449,7 +449,7 @@ static int s3c24xx_i2s_resume(struct platform_device *pdev,
SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \ SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
struct snd_soc_cpu_dai s3c24xx_i2s_dai = { struct snd_soc_dai s3c24xx_i2s_dai = {
.name = "s3c24xx-i2s", .name = "s3c24xx-i2s",
.id = 0, .id = 0,
.type = SND_SOC_DAI_I2S, .type = SND_SOC_DAI_I2S,
......
sound/soc/s3c24xx/s3c24xx-i2s.h
View file @ 1992a6fb
...@@ -32,6 +32,6 @@ ...@@ -32,6 +32,6 @@
u32 s3c24xx_i2s_get_clockrate(void); u32 s3c24xx_i2s_get_clockrate(void);
extern struct snd_soc_cpu_dai s3c24xx_i2s_dai; extern struct snd_soc_dai s3c24xx_i2s_dai;
#endif /*S3C24XXI2S_H_*/ #endif /*S3C24XXI2S_H_*/
sound/soc/s3c24xx/s3c24xx-pcm.c
View file @ 1992a6fb
...@@ -429,7 +429,7 @@ static void s3c24xx_pcm_free_dma_buffers(struct snd_pcm *pcm) ...@@ -429,7 +429,7 @@ static void s3c24xx_pcm_free_dma_buffers(struct snd_pcm *pcm)
static u64 s3c24xx_pcm_dmamask = DMA_32BIT_MASK; static u64 s3c24xx_pcm_dmamask = DMA_32BIT_MASK;
static int s3c24xx_pcm_new(struct snd_card *card, static int s3c24xx_pcm_new(struct snd_card *card,
struct snd_soc_codec_dai *dai, struct snd_pcm *pcm) struct snd_soc_dai *dai, struct snd_pcm *pcm)
{ {
int ret = 0; int ret = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7