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

Commit 46cdaba1 authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Kukjin Kim
Browse files

ARM: S3C24XX: Reuse S3C2443 dma for S3C2416 



The dma controller is similar in S3C2443 and S3C2416 and has also
the same register layout with the same REQSEL-bits in the source
select.

The only small difference is the SIO channel of the S3C2443 for the
non-hsmmc controller which is not present on S3C2416/2450 and
second spi channel which is not present on the S3C2416.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent b0990954

arch/arm/mach-s3c24xx/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ config CPU_S3C2416 
	select CPU_LLSERIAL_S3C2440

	select SAMSUNG_CLKSRC

	select S3C2443_COMMON

	select S3C2416_DMA if S3C24XX_DMA

	select S3C2443_DMA if S3C24XX_DMA

	select S3C2416_PM if PM

	help

	  Support for the S3C2416 SoC from the S3C24XX line
@@ -513,15 +513,15 @@ config S3C2443_COMMON 
	  Common code for the S3C2443 and similar processors, which includes

	  the S3C2416 and S3C2450.



endif	# CPU_S3C2443 || CPU_S3C2416



if CPU_S3C2443



config S3C2443_DMA

	bool

	help

	  Internal config node for S3C2443 DMA support



endif	# CPU_S3C2443 || CPU_S3C2416



if CPU_S3C2443



comment "S3C2443 Boards"



config MACH_SMDK2443

arch/arm/mach-s3c24xx/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -32,11 +32,11 @@ obj-$(CONFIG_CPU_S3C244X) += s3c244x.o irq-s3c244x.o clock-s3c244x.o 
obj-$(CONFIG_S3C2440_DMA)	+= dma-s3c2440.o



obj-$(CONFIG_CPU_S3C2443)	+= s3c2443.o irq-s3c2443.o clock-s3c2443.o

obj-$(CONFIG_S3C2443_DMA)	+= dma-s3c2443.o



# common code



obj-$(CONFIG_S3C2443_COMMON)	+= common-s3c2443.o

obj-$(CONFIG_S3C2443_DMA)	+= dma-s3c2443.o



#

# machine support

arch/arm/mach-s3c24xx/dma-s3c2443.c

+20 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static struct s3c24xx_dma_map __initdata s3c2443_dma_mappings[] = { 
		.name		= "xdreq1",

		.channels	= MAP(S3C2443_DMAREQSEL_XDREQ1),

	},

	[DMACH_SDI] = {

	[DMACH_SDI] = { /* only on S3C2443 */

		.name		= "sdi",

		.channels	= MAP(S3C2443_DMAREQSEL_SDI),

	},
@@ -59,7 +59,7 @@ static struct s3c24xx_dma_map __initdata s3c2443_dma_mappings[] = { 
		.name		= "spi0",

		.channels	= MAP(S3C2443_DMAREQSEL_SPI0TX),

	},

	[DMACH_SPI1] = {

	[DMACH_SPI1] = { /* only on S3C2443/S3C2450 */

		.name		= "spi1",

		.channels	= MAP(S3C2443_DMAREQSEL_SPI1TX),

	},
@@ -141,6 +141,23 @@ static int __init s3c2443_dma_add(struct device *dev) 
	return s3c24xx_dma_init_map(&s3c2443_dma_sel);

}



#ifdef CONFIG_CPU_S3C2416

/* S3C2416 DMA contains the same selection table as the S3C2443 */

static struct subsys_interface s3c2416_dma_interface = {

	.name		= "s3c2416_dma",

	.subsys		= &s3c2416_subsys,

	.add_dev	= s3c2443_dma_add,

};



static int __init s3c2416_dma_init(void)

{

	return subsys_interface_register(&s3c2416_dma_interface);

}



arch_initcall(s3c2416_dma_init);

#endif



#ifdef CONFIG_CPU_S3C2443

static struct subsys_interface s3c2443_dma_interface = {

	.name		= "s3c2443_dma",

	.subsys		= &s3c2443_subsys,
@@ -153,3 +170,4 @@ static int __init s3c2443_dma_init(void) 
}



arch_initcall(s3c2443_dma_init);

#endif

arch/arm/plat-samsung/include/plat/regs-dma.h

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ 
#define S3C2412_DMAREQSEL_UART2_1	S3C2412_DMAREQSEL_SRC(24)

#endif /* CONFIG_CPU_S3C2412 */



#ifdef CONFIG_CPU_S3C2443

#if defined(CONFIG_CPU_S3C2416) || defined(CONFIG_CPU_S3C2443)



#define S3C2443_DMAREQSEL_SRC(x)	((x) << 1)