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

Commit 8b0ae0b7 authored by Jassi Brar's avatar Jassi Brar Committed by Kukjin Kim
Browse files

ARM: S5PV310: Add platform devices for PL330 DMACs 



Samsung's Soc S5PV310 has three PL330 DMACs. First is dedicated for
Memory->Memory data transfer while the other two meant for data
transfer with peripherals.
Define and add latter two PL330 DMACs as platform devices on the
S5PV310 platform.

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

arch/arm/mach-s5pv310/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ if ARCH_S5PV310 


config CPU_S5PV310

	bool

	select S3C_PL330_DMA

	help

	  Enable S5PV310 CPU support

arch/arm/mach-s5pv310/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ obj- := 
# Core support for S5PV310 system



obj-$(CONFIG_CPU_S5PV310)	+= cpu.o init.o clock.o irq-combiner.o

obj-$(CONFIG_CPU_S5PV310)	+= setup-i2c0.o time.o gpiolib.o irq-eint.o

obj-$(CONFIG_CPU_S5PV310)	+= setup-i2c0.o time.o gpiolib.o irq-eint.o dma.o



obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o

obj-$(CONFIG_LOCAL_TIMERS)	+= localtimer.o

arch/arm/mach-s5pv310/dma.c

0 → 100644
+168 −0
Original line number Diff line number Diff line 
/*

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

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 */



#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 <plat/s3c-pl330-pdata.h>



static u64 dma_dmamask = DMA_BIT_MASK(32);



static struct resource s5pv310_pdma0_resource[] = {

	[0] = {

		.start	= S5PV310_PA_PDMA0,

		.end	= S5PV310_PA_PDMA0 + SZ_4K,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_PDMA0,

		.end	= IRQ_PDMA0,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct s3c_pl330_platdata s5pv310_pdma0_pdata = {

	.peri = {

		[0] = DMACH_PCM0_RX,

		[1] = DMACH_PCM0_TX,

		[2] = DMACH_PCM2_RX,

		[3] = DMACH_PCM2_TX,

		[4] = DMACH_MSM_REQ0,

		[5] = DMACH_MSM_REQ2,

		[6] = DMACH_SPI0_RX,

		[7] = DMACH_SPI0_TX,

		[8] = DMACH_SPI2_RX,

		[9] = DMACH_SPI2_TX,

		[10] = DMACH_I2S0S_TX,

		[11] = DMACH_I2S0_RX,

		[12] = DMACH_I2S0_TX,

		[13] = DMACH_I2S2_RX,

		[14] = DMACH_I2S2_TX,

		[15] = DMACH_UART0_RX,

		[16] = DMACH_UART0_TX,

		[17] = DMACH_UART2_RX,

		[18] = DMACH_UART2_TX,

		[19] = DMACH_UART4_RX,

		[20] = DMACH_UART4_TX,

		[21] = DMACH_SLIMBUS0_RX,

		[22] = DMACH_SLIMBUS0_TX,

		[23] = DMACH_SLIMBUS2_RX,

		[24] = DMACH_SLIMBUS2_TX,

		[25] = DMACH_SLIMBUS4_RX,

		[26] = DMACH_SLIMBUS4_TX,

		[27] = DMACH_AC97_MICIN,

		[28] = DMACH_AC97_PCMIN,

		[29] = DMACH_AC97_PCMOUT,

		[30] = DMACH_MAX,

		[31] = DMACH_MAX,

	},

};



static struct platform_device s5pv310_device_pdma0 = {

	.name		= "s3c-pl330",

	.id		= 0,

	.num_resources	= ARRAY_SIZE(s5pv310_pdma0_resource),

	.resource	= s5pv310_pdma0_resource,

	.dev		= {

		.dma_mask = &dma_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = &s5pv310_pdma0_pdata,

	},

};



static struct resource s5pv310_pdma1_resource[] = {

	[0] = {

		.start	= S5PV310_PA_PDMA1,

		.end	= S5PV310_PA_PDMA1 + SZ_4K,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_PDMA1,

		.end	= IRQ_PDMA1,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct s3c_pl330_platdata s5pv310_pdma1_pdata = {

	.peri = {

		[0] = DMACH_PCM0_RX,

		[1] = DMACH_PCM0_TX,

		[2] = DMACH_PCM1_RX,

		[3] = DMACH_PCM1_TX,

		[4] = DMACH_MSM_REQ1,

		[5] = DMACH_MSM_REQ3,

		[6] = DMACH_SPI1_RX,

		[7] = DMACH_SPI1_TX,

		[8] = DMACH_I2S0S_TX,

		[9] = DMACH_I2S0_RX,

		[10] = DMACH_I2S0_TX,

		[11] = DMACH_I2S1_RX,

		[12] = DMACH_I2S1_TX,

		[13] = DMACH_UART0_RX,

		[14] = DMACH_UART0_TX,

		[15] = DMACH_UART1_RX,

		[16] = DMACH_UART1_TX,

		[17] = DMACH_UART3_RX,

		[18] = DMACH_UART3_TX,

		[19] = DMACH_SLIMBUS1_RX,

		[20] = DMACH_SLIMBUS1_TX,

		[21] = DMACH_SLIMBUS3_RX,

		[22] = DMACH_SLIMBUS3_TX,

		[23] = DMACH_SLIMBUS5_RX,

		[24] = DMACH_SLIMBUS5_TX,

		[25] = DMACH_SLIMBUS0AUX_RX,

		[26] = DMACH_SLIMBUS0AUX_TX,

		[27] = DMACH_SPDIF,

		[28] = DMACH_MAX,

		[29] = DMACH_MAX,

		[30] = DMACH_MAX,

		[31] = DMACH_MAX,

	},

};



static struct platform_device s5pv310_device_pdma1 = {

	.name		= "s3c-pl330",

	.id		= 1,

	.num_resources	= ARRAY_SIZE(s5pv310_pdma1_resource),

	.resource	= s5pv310_pdma1_resource,

	.dev		= {

		.dma_mask = &dma_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = &s5pv310_pdma1_pdata,

	},

};



static struct platform_device *s5pv310_dmacs[] __initdata = {

	&s5pv310_device_pdma0,

	&s5pv310_device_pdma1,

};



static int __init s5pv310_dma_init(void)

{

	platform_add_devices(s5pv310_dmacs, ARRAY_SIZE(s5pv310_dmacs));



	return 0;

}

arch_initcall(s5pv310_dma_init);

arch/arm/mach-s5pv310/include/mach/dma.h

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

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

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 */



#ifndef __MACH_DMA_H

#define __MACH_DMA_H



/* This platform uses the common S3C DMA API driver for PL330 */

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



#endif /* __MACH_DMA_H */

arch/arm/mach-s5pv310/include/mach/irqs.h

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ 
#define COMBINER_GROUP(x)	((x) * MAX_IRQ_IN_COMBINER + IRQ_SPI(64))

#define COMBINER_IRQ(x, y)	(COMBINER_GROUP(x) + y)



#define IRQ_PDMA0		COMBINER_IRQ(21, 0)

#define IRQ_PDMA1		COMBINER_IRQ(21, 1)



#define IRQ_TIMER0_VIC		COMBINER_IRQ(22, 0)

#define IRQ_TIMER1_VIC		COMBINER_IRQ(22, 1)

#define IRQ_TIMER2_VIC		COMBINER_IRQ(22, 2)