ARM: Merge for-2635/s5p-dma (1e8ff636) · Commits · 戴 / test

arch/arm/mach-s5p6440/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ if ARCH_S5P6440

		config CPU_S5P6440
		bool
		select S3C_PL330_DMA
		help
		Enable S5P6440 CPU support

arch/arm/mach-s5p6440/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ obj- :=

		# Core support for S5P6440 system

		obj-$(CONFIG_CPU_S5P6440) += cpu.o init.o clock.o gpio.o
		obj-$(CONFIG_CPU_S5P6440) += cpu.o init.o clock.o gpio.o dma.o

		# machine support

arch/arm/mach-s5p6440/dma.c

0 → 100644

+105 −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 s5p6440_pdma_resource[] = {
		[0] = {
		.start = S5P6440_PA_PDMA,
		.end = S5P6440_PA_PDMA + SZ_4K,
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = IRQ_DMA0,
		.end = IRQ_DMA0,
		.flags = IORESOURCE_IRQ,
		},
		};

		static struct s3c_pl330_platdata s5p6440_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_MAX,
		[9] = DMACH_MAX,
		[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_MAX,
		[17] = DMACH_MAX,
		[18] = DMACH_MAX,
		[19] = DMACH_MAX,
		[20] = DMACH_SPI1_TX,
		[21] = DMACH_SPI1_RX,
		[22] = DMACH_MAX,
		[23] = DMACH_MAX,
		[24] = DMACH_MAX,
		[25] = DMACH_MAX,
		[26] = DMACH_MAX,
		[27] = DMACH_MAX,
		[28] = DMACH_MAX,
		[29] = DMACH_PWM,
		[30] = DMACH_MAX,
		[31] = DMACH_MAX,
		},
		};

		static struct platform_device s5p6440_device_pdma = {
		.name = "s3c-pl330",
		.id = 1,
		.num_resources = ARRAY_SIZE(s5p6440_pdma_resource),
		.resource = s5p6440_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)
		{
		platform_add_devices(s5p6440_dmacs, ARRAY_SIZE(s5p6440_dmacs));

		return 0;
		}
		arch_initcall(s5p6440_dma_init);

arch/arm/mach-s5p6440/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-s5p6440/include/mach/map.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,8 @@
		#define S5P6440_PA_VIC0 (0xE4000000)
		#define S5P_PA_VIC0 S5P6440_PA_VIC0

		#define S5P6440_PA_PDMA 0xE9000000

		#define S5P6440_PA_VIC1 (0xE4100000)
		#define S5P_PA_VIC1 S5P6440_PA_VIC1

Admin message