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

Commit f1fee582 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: S5P64X0: Move DMA support for S5P64X0 



This patch moves DMA support files in the mach-s5p64x0
for S5P6440 and S5P6450 SoCs.

Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Cc: Jassi Brar <jassi.brar@samsung.com>
parent e661faa4

arch/arm/mach-s5p6440/dma.c→arch/arm/mach-s5p64x0/dma.c

+65 −21
Original line number Diff line number Diff line 
/*

/* linux/arch/arm/mach-s5p64x0/dma.c

 *

 * Copyright (c) 2010 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * Copyright (C) 2010 Samsung Electronics Co. Ltd.

 *	Jaswinder Singh <jassi.brar@samsung.com>

 *
@@ -20,20 +24,19 @@ 
#include <linux/platform_device.h>

#include <linux/dma-mapping.h>



#include <plat/devs.h>

#include <plat/irqs.h>



#include <mach/map.h>

#include <mach/irqs.h>

#include <mach/regs-clock.h>



#include <plat/devs.h>

#include <plat/s3c-pl330-pdata.h>



static u64 dma_dmamask = DMA_BIT_MASK(32);



static struct resource s5p6440_pdma_resource[] = {

static struct resource s5p64x0_pdma_resource[] = {

	[0] = {

		.start  = S5P6440_PA_PDMA,

		.end    = S5P6440_PA_PDMA + SZ_4K,

		.start	= S5P64X0_PA_PDMA,

		.end	= S5P64X0_PA_PDMA + SZ_4K,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -80,26 +83,67 @@ static struct s3c_pl330_platdata s5p6440_pdma_pdata = { 
	},

};



static struct platform_device s5p6440_device_pdma = {

static struct s3c_pl330_platdata s5p6450_pdma_pdata = {

	.peri = {

		[0] = DMACH_UART0_RX,

		[1] = DMACH_UART0_TX,

		[2] = DMACH_UART1_RX,

		[3] = DMACH_UART1_TX,

		[4] = DMACH_UART2_RX,

		[5] = DMACH_UART2_TX,

		[6] = DMACH_UART3_RX,

		[7] = DMACH_UART3_TX,

		[8] = DMACH_UART4_RX,

		[9] = DMACH_UART4_TX,

		[10] = DMACH_PCM0_TX,

		[11] = DMACH_PCM0_RX,

		[12] = DMACH_I2S0_TX,

		[13] = DMACH_I2S0_RX,

		[14] = DMACH_SPI0_TX,

		[15] = DMACH_SPI0_RX,

		[16] = DMACH_PCM1_TX,

		[17] = DMACH_PCM1_RX,

		[18] = DMACH_PCM2_TX,

		[19] = DMACH_PCM2_RX,

		[20] = DMACH_SPI1_TX,

		[21] = DMACH_SPI1_RX,

		[22] = DMACH_USI_TX,

		[23] = DMACH_USI_RX,

		[24] = DMACH_MAX,

		[25] = DMACH_I2S1_TX,

		[26] = DMACH_I2S1_RX,

		[27] = DMACH_I2S2_TX,

		[28] = DMACH_I2S2_RX,

		[29] = DMACH_PWM,

		[30] = DMACH_UART5_RX,

		[31] = DMACH_UART5_TX,

	},

};



static struct platform_device s5p64x0_device_pdma = {

	.name		= "s3c-pl330",

	.id		= 1,

	.num_resources	= ARRAY_SIZE(s5p6440_pdma_resource),

	.resource	= s5p6440_pdma_resource,

	.id		= 0,

	.num_resources	= ARRAY_SIZE(s5p64x0_pdma_resource),

	.resource	= s5p64x0_pdma_resource,

	.dev		= {

		.dma_mask = &dma_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = &s5p6440_pdma_pdata,

	},

};



static struct platform_device *s5p6440_dmacs[] __initdata = {

	&s5p6440_device_pdma,

};



static int __init s5p6440_dma_init(void)

static int __init s5p64x0_dma_init(void)

{

	platform_add_devices(s5p6440_dmacs, ARRAY_SIZE(s5p6440_dmacs));

	unsigned int id;



	id = __raw_readl(S5P64X0_SYS_ID) & 0xFF000;



	if (id == 0x50000)

		s5p64x0_device_pdma.dev.platform_data = &s5p6450_pdma_pdata;

	else

		s5p64x0_device_pdma.dev.platform_data = &s5p6440_pdma_pdata;



	platform_device_register(&s5p64x0_device_pdma);



	return 0;

}

arch_initcall(s5p6440_dma_init);
 
arch_initcall(s5p64x0_dma_init);

arch/arm/plat-samsung/include/plat/s3c-dma-pl330.h

+20 −0
Original line number Diff line number Diff line
@@ -32,6 +32,12 @@ enum dma_ch { 
	DMACH_UART2_TX,

	DMACH_UART3_RX,

	DMACH_UART3_TX,

	DMACH_UART4_RX,

	DMACH_UART4_TX,

	DMACH_UART5_RX,

	DMACH_UART5_TX,

	DMACH_USI_RX,

	DMACH_USI_TX,

	DMACH_IRDA,

	DMACH_I2S0_RX,

	DMACH_I2S0_TX,
@@ -64,6 +70,20 @@ enum dma_ch { 
	DMACH_MSM_REQ2,

	DMACH_MSM_REQ1,

	DMACH_MSM_REQ0,

	DMACH_SLIMBUS0_RX,

	DMACH_SLIMBUS0_TX,

	DMACH_SLIMBUS0AUX_RX,

	DMACH_SLIMBUS0AUX_TX,

	DMACH_SLIMBUS1_RX,

	DMACH_SLIMBUS1_TX,

	DMACH_SLIMBUS2_RX,

	DMACH_SLIMBUS2_TX,

	DMACH_SLIMBUS3_RX,

	DMACH_SLIMBUS3_TX,

	DMACH_SLIMBUS4_RX,

	DMACH_SLIMBUS4_TX,

	DMACH_SLIMBUS5_RX,

	DMACH_SLIMBUS5_TX,

	/* END Marker, also used to denote a reserved channel */

	DMACH_MAX,

};