[alsa-devel] [PATCH v4 3/3] ARM: S3C24XX: I2S multi-component-related fixes

[Marek Vasut]

Dne Ne 29. srpna 2010 19:11:12 Vasily Khoruzhick napsal(a):
> Export s3c_device_pcm for all S3C24xx-devices, not
> only for S3C2440;
> Fix device name for s3c_device_iis;
> 

Won't moving this from #ifdef CONFIG_CPU_S32440 trouble other s3c24xx CPUs? If 
not, that's ok.

> Signed-off-by: Vasily Khoruzhick <anarsoul at gmail.com>
> ---
>  arch/arm/plat-s3c24xx/devs.c |   32 ++++++++++++++++----------------
>  1 files changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c
> index 9f8ee5e..2f91057 100644
> --- a/arch/arm/plat-s3c24xx/devs.c
> +++ b/arch/arm/plat-s3c24xx/devs.c
> @@ -247,7 +247,7 @@ static struct resource s3c_iis_resource[] = {
>  static u64 s3c_device_iis_dmamask = 0xffffffffUL;
> 
>  struct platform_device s3c_device_iis = {
> -	.name		  = "s3c2410-iis",
> +	.name		  = "s3c24xx-iis",
>  	.id		  = -1,
>  	.num_resources	  = ARRAY_SIZE(s3c_iis_resource),
>  	.resource	  = s3c_iis_resource,
> @@ -259,6 +259,21 @@ struct platform_device s3c_device_iis = {
> 
>  EXPORT_SYMBOL(s3c_device_iis);
> 
> +/* ASoC PCM DMA */
> +
> +static u64 s3c_device_audio_dmamask = 0xffffffffUL;
> +
> +struct platform_device s3c_device_pcm = {
> +	.name		  = "s3c24xx-pcm-audio",
> +	.id		  = -1,
> +	.dev              = {
> +		.dma_mask = &s3c_device_audio_dmamask,
> +		.coherent_dma_mask = 0xffffffffUL
> +	}
> +};
> +
> +EXPORT_SYMBOL(s3c_device_pcm);
> +
>  /* RTC */
> 
>  static struct resource s3c_rtc_resource[] = {
> @@ -481,8 +496,6 @@ static struct resource s3c_ac97_resource[] = {
>  	},
>  };
> 
> -static u64 s3c_device_audio_dmamask = 0xffffffffUL;
> -
>  struct platform_device s3c_device_ac97 = {
>  	.name		  = "s3c-ac97",
>  	.id		  = -1,
> @@ -496,19 +509,6 @@ struct platform_device s3c_device_ac97 = {
> 
>  EXPORT_SYMBOL(s3c_device_ac97);
> 
> -/* ASoC PCM DMA */
> -
> -struct platform_device s3c_device_pcm = {
> -	.name		  = "s3c24xx-pcm-audio",
> -	.id		  = -1,
> -	.dev              = {
> -		.dma_mask = &s3c_device_audio_dmamask,
> -		.coherent_dma_mask = 0xffffffffUL
> -	}
> -};
> -
> -EXPORT_SYMBOL(s3c_device_pcm);
> -
>  /* ASoC I2S */
> 
>  struct platform_device s3c2412_device_iis = {