Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c9b1257 authored by Jassi Brar's avatar Jassi Brar Committed by Mark Brown
Browse files

ASoC: S3C: I2Sv2: Segregate hw_params callback 



Towards having build for multiple SoCs segregate hw_params callback
for s3c2412 and s3c64xx.
Since, all new SoCs have s3c64xx like register map, we keep that as
default implementation if no SoC specific callback is already defined.

Signed-off-by: default avatarJassi Brar <jassi.brar@samsung.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent bf328826

sound/soc/s3c24xx/s3c-i2s-v2.c

+3 −15
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai, 
	return 0;

}



static int s3c2412_i2s_hw_params(struct snd_pcm_substream *substream,

static int s3c_i2sv2_hw_params(struct snd_pcm_substream *substream,

				 struct snd_pcm_hw_params *params,

				 struct snd_soc_dai *socdai)

{
@@ -346,18 +346,6 @@ static int s3c2412_i2s_hw_params(struct snd_pcm_substream *substream, 
	iismod = readl(i2s->regs + S3C2412_IISMOD);

	pr_debug("%s: r: IISMOD: %x\n", __func__, iismod);



#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)

	switch (params_format(params)) {

	case SNDRV_PCM_FORMAT_S8:

		iismod |= S3C2412_IISMOD_8BIT;

		break;

	case SNDRV_PCM_FORMAT_S16_LE:

		iismod &= ~S3C2412_IISMOD_8BIT;

		break;

	}

#endif



#ifdef CONFIG_PLAT_S3C64XX

	iismod &= ~S3C64XX_IISMOD_BLC_MASK;

	/* Sample size */

	switch (params_format(params)) {
@@ -370,7 +358,6 @@ static int s3c2412_i2s_hw_params(struct snd_pcm_substream *substream, 
		iismod |= S3C64XX_IISMOD_BLC_24BIT;

		break;

	}

#endif



	writel(iismod, i2s->regs + S3C2412_IISMOD);

	pr_debug("%s: w: IISMOD: %x\n", __func__, iismod);
@@ -730,7 +717,8 @@ int s3c_i2sv2_register_dai(struct snd_soc_dai *dai) 
	struct snd_soc_dai_ops *ops = dai->ops;



	ops->trigger = s3c2412_i2s_trigger;

	ops->hw_params = s3c2412_i2s_hw_params;

	if (!ops->hw_params)

		ops->hw_params = s3c_i2sv2_hw_params;

	ops->set_fmt = s3c2412_i2s_set_fmt;

	ops->set_clkdiv = s3c2412_i2s_set_clkdiv;

sound/soc/s3c24xx/s3c2412-i2s.c

+37 −0
Original line number Diff line number Diff line
@@ -103,6 +103,10 @@ struct clk *s3c2412_get_iisclk(void) 
}

EXPORT_SYMBOL_GPL(s3c2412_get_iisclk);



static inline struct s3c_i2sv2_info *to_info(struct snd_soc_dai *cpu_dai)

{

	return cpu_dai->private_data;

}



static int s3c2412_i2s_probe(struct platform_device *pdev,

			     struct snd_soc_dai *dai)
@@ -142,6 +146,38 @@ static int s3c2412_i2s_probe(struct platform_device *pdev, 
	return 0;

}



static int s3c2412_i2s_hw_params(struct snd_pcm_substream *substream,

				 struct snd_pcm_hw_params *params,

				 struct snd_soc_dai *cpu_dai)

{

	struct s3c_i2sv2_info *i2s = to_info(cpu_dai);

	u32 iismod;



	pr_debug("Entered %s\n", __func__);



	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)

		cpu_dai->dma_data = i2s->dma_playback;

	else

		cpu_dai->dma_data = i2s->dma_capture;



	iismod = readl(i2s->regs + S3C2412_IISMOD);

	pr_debug("%s: r: IISMOD: %x\n", __func__, iismod);



	switch (params_format(params)) {

	case SNDRV_PCM_FORMAT_S8:

		iismod |= S3C2412_IISMOD_8BIT;

		break;

	case SNDRV_PCM_FORMAT_S16_LE:

		iismod &= ~S3C2412_IISMOD_8BIT;

		break;

	}



	writel(iismod, i2s->regs + S3C2412_IISMOD);

	pr_debug("%s: w: IISMOD: %x\n", __func__, iismod);



	return 0;

}



#define S3C2412_I2S_RATES \

	(SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_16000 | \

	SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
@@ -149,6 +185,7 @@ static int s3c2412_i2s_probe(struct platform_device *pdev, 


static struct snd_soc_dai_ops s3c2412_i2s_dai_ops = {

	.set_sysclk	= s3c2412_i2s_set_sysclk,

	.hw_params	= s3c2412_i2s_hw_params,

};



struct snd_soc_dai s3c2412_i2s_dai = {