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

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

ARM: Samsung: Define common audio-dma device 



The ASoC uses common DMA driver for Audio devices. So it makes
sense to a common audio-dma device shared across all platforms.

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

arch/arm/mach-s3c2410/mach-h1940.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static struct platform_device *h1940_devices[] __initdata = { 
	&s3c_device_wdt,

	&s3c_device_i2c0,

	&s3c_device_iis,

	&s3c_device_pcm,

	&samsung_asoc_dma,

	&s3c_device_usbgadget,

	&h1940_device_leds,

	&h1940_device_bluetooth,

arch/arm/mach-s3c2440/mach-rx1950.c

+1 −1
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ static struct platform_device *rx1950_devices[] __initdata = { 
	&s3c_device_wdt,

	&s3c_device_i2c0,

	&s3c_device_iis,

	&s3c_device_pcm,

	&samsung_asoc_dma,

	&s3c_device_usbgadget,

	&s3c_device_rtc,

	&s3c_device_nand,

arch/arm/mach-s3c64xx/dev-audio.c

+0 −13
Original line number Diff line number Diff line
@@ -315,16 +315,3 @@ void __init s3c64xx_ac97_setup_gpio(int num) 
	else

		s3c_ac97_pdata.cfg_gpio = s3c64xx_ac97_cfg_gpe;

}
 


static u64 s3c_device_audio_dmamask = 0xffffffffUL;



struct platform_device s3c_device_pcm = {

	.name		  = "samsung-audio",

	.id		  = -1,

	.dev              = {

		.dma_mask = &s3c_device_audio_dmamask,

		.coherent_dma_mask = 0xffffffffUL

	}

};

EXPORT_SYMBOL(s3c_device_pcm);

arch/arm/mach-s3c64xx/mach-smdk6410.c

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static struct platform_device *smdk6410_devices[] __initdata = { 
	&s3c_device_fb,

	&s3c_device_ohci,

	&s3c_device_usb_hsotg,

	&s3c_device_pcm,

	&samsung_asoc_dma,

	&s3c64xx_device_iisv4,

	&samsung_device_keypad,

arch/arm/plat-s3c24xx/devs.c

+2 −15
Original line number Diff line number Diff line
@@ -259,21 +259,6 @@ 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		  = "samsung-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[] = {
@@ -496,6 +481,8 @@ static struct resource s3c_ac97_resource[] = { 
	},

};



static u64 s3c_device_audio_dmamask = 0xffffffffUL;



struct platform_device s3c_device_ac97 = {

	.name		  = "s3c-ac97",

	.id		  = -1,