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

ASoC: Rename s3c24xx_pcm prefix to s3c_dma 



The s3c24xx_pcm prefix for the soc_platform is inappropriate when
some Samsung SoCs have PCM controllers which will eventually have
drivers and hence namespace ambiguities.

To resolve naming ambiguities in future the following have been
renamed in order
1) s3c24xx_pcm_dma_params -> s3c_dma_params
2) s3c24xx_pcm_preallocate_dma_buffer -> s3c_preallocate_dma_buffer
3) s3c24xx_pcm_dmamask -> s3c_dma_mask
4) s3c24xx_pcm_XXX -> s3c_dma_XXX

Signed-off-by: default avatarJassi Brar <jassi.brar@samsung.com>
Acked-by: default avatarBen Dooks <ben-linux@fluff.org>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 8df89bc3

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

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ static int s3c2412_i2s_trigger(struct snd_pcm_substream *substream, int cmd, 
	int capture = (substream->stream == SNDRV_PCM_STREAM_CAPTURE);

	unsigned long irqs;

	int ret = 0;

	int channel = ((struct s3c24xx_pcm_dma_params *)

	int channel = ((struct s3c_dma_params *)

		  rtd->dai->cpu_dai->dma_data)->channel;



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

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

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ struct s3c_i2sv2_info { 


	unsigned char	 master;



	struct s3c24xx_pcm_dma_params	*dma_playback;

	struct s3c24xx_pcm_dma_params	*dma_capture;

	struct s3c_dma_params	*dma_playback;

	struct s3c_dma_params	*dma_capture;



	u32		 suspend_iismod;

	u32		 suspend_iiscon;

sound/soc/s3c24xx/s3c2412-i2s.c

+2 −2
Original line number Diff line number Diff line
@@ -50,14 +50,14 @@ static struct s3c2410_dma_client s3c2412_dma_client_in = { 
	.name		= "I2S PCM Stereo in"

};



static struct s3c24xx_pcm_dma_params s3c2412_i2s_pcm_stereo_out = {

static struct s3c_dma_params s3c2412_i2s_pcm_stereo_out = {

	.client		= &s3c2412_dma_client_out,

	.channel	= DMACH_I2S_OUT,

	.dma_addr	= S3C2410_PA_IIS + S3C2412_IISTXD,

	.dma_size	= 4,

};



static struct s3c24xx_pcm_dma_params s3c2412_i2s_pcm_stereo_in = {

static struct s3c_dma_params s3c2412_i2s_pcm_stereo_in = {

	.client		= &s3c2412_dma_client_in,

	.channel	= DMACH_I2S_IN,

	.dma_addr	= S3C2410_PA_IIS + S3C2412_IISRXD,

sound/soc/s3c24xx/s3c2443-ac97.c

+5 −5
Original line number Diff line number Diff line
@@ -188,21 +188,21 @@ static struct s3c2410_dma_client s3c2443_dma_client_micin = { 
	.name = "AC97 Mic Mono in"

};



static struct s3c24xx_pcm_dma_params s3c2443_ac97_pcm_stereo_out = {

static struct s3c_dma_params s3c2443_ac97_pcm_stereo_out = {

	.client		= &s3c2443_dma_client_out,

	.channel	= DMACH_PCM_OUT,

	.dma_addr	= S3C2440_PA_AC97 + S3C_AC97_PCM_DATA,

	.dma_size	= 4,

};



static struct s3c24xx_pcm_dma_params s3c2443_ac97_pcm_stereo_in = {

static struct s3c_dma_params s3c2443_ac97_pcm_stereo_in = {

	.client		= &s3c2443_dma_client_in,

	.channel	= DMACH_PCM_IN,

	.dma_addr	= S3C2440_PA_AC97 + S3C_AC97_PCM_DATA,

	.dma_size	= 4,

};



static struct s3c24xx_pcm_dma_params s3c2443_ac97_mic_mono_in = {

static struct s3c_dma_params s3c2443_ac97_mic_mono_in = {

	.client		= &s3c2443_dma_client_micin,

	.channel	= DMACH_MIC_IN,

	.dma_addr	= S3C2440_PA_AC97 + S3C_AC97_MIC_DATA,
@@ -290,7 +290,7 @@ static int s3c2443_ac97_trigger(struct snd_pcm_substream *substream, int cmd, 
{

	u32 ac_glbctrl;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	int channel = ((struct s3c24xx_pcm_dma_params *)

	int channel = ((struct s3c_dma_params *)

		  rtd->dai->cpu_dai->dma_data)->channel;



	ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL);
@@ -339,7 +339,7 @@ static int s3c2443_ac97_mic_trigger(struct snd_pcm_substream *substream, 
{

	u32 ac_glbctrl;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	int channel = ((struct s3c24xx_pcm_dma_params *)

	int channel = ((struct s3c_dma_params *)

		  rtd->dai->cpu_dai->dma_data)->channel;



	ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL);

sound/soc/s3c24xx/s3c24xx-i2s.c

+5 −5
Original line number Diff line number Diff line
@@ -49,14 +49,14 @@ static struct s3c2410_dma_client s3c24xx_dma_client_in = { 
	.name = "I2S PCM Stereo in"

};



static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_out = {

static struct s3c_dma_params s3c24xx_i2s_pcm_stereo_out = {

	.client		= &s3c24xx_dma_client_out,

	.channel	= DMACH_I2S_OUT,

	.dma_addr	= S3C2410_PA_IIS + S3C2410_IISFIFO,

	.dma_size	= 2,

};



static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_in = {

static struct s3c_dma_params s3c24xx_i2s_pcm_stereo_in = {

	.client		= &s3c24xx_dma_client_in,

	.channel	= DMACH_I2S_IN,

	.dma_addr	= S3C2410_PA_IIS + S3C2410_IISFIFO,
@@ -258,12 +258,12 @@ static int s3c24xx_i2s_hw_params(struct snd_pcm_substream *substream, 
	switch (params_format(params)) {

	case SNDRV_PCM_FORMAT_S8:

		iismod &= ~S3C2410_IISMOD_16BIT;

		((struct s3c24xx_pcm_dma_params *)

		((struct s3c_dma_params *)

		  rtd->dai->cpu_dai->dma_data)->dma_size = 1;

		break;

	case SNDRV_PCM_FORMAT_S16_LE:

		iismod |= S3C2410_IISMOD_16BIT;

		((struct s3c24xx_pcm_dma_params *)

		((struct s3c_dma_params *)

		  rtd->dai->cpu_dai->dma_data)->dma_size = 2;

		break;

	default:
@@ -280,7 +280,7 @@ static int s3c24xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd, 
{

	int ret = 0;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	int channel = ((struct s3c24xx_pcm_dma_params *)

	int channel = ((struct s3c_dma_params *)

		  rtd->dai->cpu_dai->dma_data)->channel;



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE