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

Commit ada69e3c authored by Vasily Khoruzhick's avatar Vasily Khoruzhick Committed by Mark Brown
Browse files

ARM: S3C24XX: I2S multi-component-related fixes



Export s3c_device_pcm for all S3C24xx-devices, not
only for S3C2440;
Fix device name for s3c_device_iis;

Signed-off-by: default avatarVasily Khoruzhick <anarsoul@gmail.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 81d97802
Loading
Loading
Loading
Loading
+16 −16
Original line number Original line Diff line number Diff line
@@ -247,7 +247,7 @@ static struct resource s3c_iis_resource[] = {
static u64 s3c_device_iis_dmamask = 0xffffffffUL;
static u64 s3c_device_iis_dmamask = 0xffffffffUL;


struct platform_device s3c_device_iis = {
struct platform_device s3c_device_iis = {
	.name		  = "s3c2410-iis",
	.name		  = "s3c24xx-iis",
	.id		  = -1,
	.id		  = -1,
	.num_resources	  = ARRAY_SIZE(s3c_iis_resource),
	.num_resources	  = ARRAY_SIZE(s3c_iis_resource),
	.resource	  = s3c_iis_resource,
	.resource	  = s3c_iis_resource,
@@ -259,6 +259,21 @@ struct platform_device s3c_device_iis = {


EXPORT_SYMBOL(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 */
/* RTC */


static struct resource s3c_rtc_resource[] = {
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 = {
struct platform_device s3c_device_ac97 = {
	.name		  = "s3c-ac97",
	.name		  = "s3c-ac97",
	.id		  = -1,
	.id		  = -1,
@@ -496,19 +509,6 @@ struct platform_device s3c_device_ac97 = {


EXPORT_SYMBOL(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 */
/* ASoC I2S */


struct platform_device s3c2412_device_iis = {
struct platform_device s3c2412_device_iis = {