ARM: Merge for-2635/s5p-dma
Merge branch 'for-2635/s5p-dma' into for-linus/samsung2 Conflicts: arch/arm/mach-s5pv210/Makefile
This commit is contained in:
commit
1e8ff636be
|
@ -9,6 +9,7 @@ if ARCH_S5P6440
|
||||||
|
|
||||||
config CPU_S5P6440
|
config CPU_S5P6440
|
||||||
bool
|
bool
|
||||||
|
select S3C_PL330_DMA
|
||||||
help
|
help
|
||||||
Enable S5P6440 CPU support
|
Enable S5P6440 CPU support
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ obj- :=
|
||||||
|
|
||||||
# Core support for S5P6440 system
|
# 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
|
# machine support
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,105 @@
|
||||||
|
/*
|
||||||
|
* 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);
|
|
@ -0,0 +1,26 @@
|
||||||
|
/*
|
||||||
|
* 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 */
|
|
@ -29,6 +29,8 @@
|
||||||
#define S5P6440_PA_VIC0 (0xE4000000)
|
#define S5P6440_PA_VIC0 (0xE4000000)
|
||||||
#define S5P_PA_VIC0 S5P6440_PA_VIC0
|
#define S5P_PA_VIC0 S5P6440_PA_VIC0
|
||||||
|
|
||||||
|
#define S5P6440_PA_PDMA 0xE9000000
|
||||||
|
|
||||||
#define S5P6440_PA_VIC1 (0xE4100000)
|
#define S5P6440_PA_VIC1 (0xE4100000)
|
||||||
#define S5P_PA_VIC1 S5P6440_PA_VIC1
|
#define S5P_PA_VIC1 S5P6440_PA_VIC1
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,7 @@ if ARCH_S5P6442
|
||||||
config CPU_S5P6442
|
config CPU_S5P6442
|
||||||
bool
|
bool
|
||||||
select PLAT_S5P
|
select PLAT_S5P
|
||||||
|
select S3C_PL330_DMA
|
||||||
help
|
help
|
||||||
Enable S5P6442 CPU support
|
Enable S5P6442 CPU support
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ obj- :=
|
||||||
|
|
||||||
# Core support for S5P6442 system
|
# Core support for S5P6442 system
|
||||||
|
|
||||||
obj-$(CONFIG_CPU_S5P6442) += cpu.o init.o clock.o
|
obj-$(CONFIG_CPU_S5P6442) += cpu.o init.o clock.o dma.o
|
||||||
|
|
||||||
# machine support
|
# machine support
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,105 @@
|
||||||
|
/*
|
||||||
|
* 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 s5p6442_pdma_resource[] = {
|
||||||
|
[0] = {
|
||||||
|
.start = S5P6442_PA_PDMA,
|
||||||
|
.end = S5P6442_PA_PDMA + SZ_4K,
|
||||||
|
.flags = IORESOURCE_MEM,
|
||||||
|
},
|
||||||
|
[1] = {
|
||||||
|
.start = IRQ_PDMA,
|
||||||
|
.end = IRQ_PDMA,
|
||||||
|
.flags = IORESOURCE_IRQ,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct s3c_pl330_platdata s5p6442_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_MAX,
|
||||||
|
[7] = DMACH_MAX,
|
||||||
|
[8] = DMACH_MAX,
|
||||||
|
[9] = DMACH_I2S0_RX,
|
||||||
|
[10] = DMACH_I2S0_TX,
|
||||||
|
[11] = DMACH_I2S0S_TX,
|
||||||
|
[12] = DMACH_I2S1_RX,
|
||||||
|
[13] = DMACH_I2S1_TX,
|
||||||
|
[14] = DMACH_MAX,
|
||||||
|
[15] = DMACH_MAX,
|
||||||
|
[16] = DMACH_SPI0_RX,
|
||||||
|
[17] = DMACH_SPI0_TX,
|
||||||
|
[18] = DMACH_MAX,
|
||||||
|
[19] = DMACH_MAX,
|
||||||
|
[20] = DMACH_PCM0_RX,
|
||||||
|
[21] = DMACH_PCM0_TX,
|
||||||
|
[22] = DMACH_PCM1_RX,
|
||||||
|
[23] = DMACH_PCM1_TX,
|
||||||
|
[24] = DMACH_MAX,
|
||||||
|
[25] = DMACH_MAX,
|
||||||
|
[26] = DMACH_MAX,
|
||||||
|
[27] = DMACH_MSM_REQ0,
|
||||||
|
[28] = DMACH_MSM_REQ1,
|
||||||
|
[29] = DMACH_MSM_REQ2,
|
||||||
|
[30] = DMACH_MSM_REQ3,
|
||||||
|
[31] = DMACH_MAX,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct platform_device s5p6442_device_pdma = {
|
||||||
|
.name = "s3c-pl330",
|
||||||
|
.id = 1,
|
||||||
|
.num_resources = ARRAY_SIZE(s5p6442_pdma_resource),
|
||||||
|
.resource = s5p6442_pdma_resource,
|
||||||
|
.dev = {
|
||||||
|
.dma_mask = &dma_dmamask,
|
||||||
|
.coherent_dma_mask = DMA_BIT_MASK(32),
|
||||||
|
.platform_data = &s5p6442_pdma_pdata,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct platform_device *s5p6442_dmacs[] __initdata = {
|
||||||
|
&s5p6442_device_pdma,
|
||||||
|
};
|
||||||
|
|
||||||
|
static int __init s5p6442_dma_init(void)
|
||||||
|
{
|
||||||
|
platform_add_devices(s5p6442_dmacs, ARRAY_SIZE(s5p6442_dmacs));
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
arch_initcall(s5p6442_dma_init);
|
|
@ -0,0 +1,26 @@
|
||||||
|
/*
|
||||||
|
* 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 */
|
|
@ -34,6 +34,9 @@
|
||||||
#define S5P6442_PA_VIC2 (0xE4200000)
|
#define S5P6442_PA_VIC2 (0xE4200000)
|
||||||
#define S5P_PA_VIC2 S5P6442_PA_VIC2
|
#define S5P_PA_VIC2 S5P6442_PA_VIC2
|
||||||
|
|
||||||
|
#define S5P6442_PA_MDMA 0xE8000000
|
||||||
|
#define S5P6442_PA_PDMA 0xE9000000
|
||||||
|
|
||||||
#define S5P6442_PA_TIMER (0xEA000000)
|
#define S5P6442_PA_TIMER (0xEA000000)
|
||||||
#define S5P_PA_TIMER S5P6442_PA_TIMER
|
#define S5P_PA_TIMER S5P6442_PA_TIMER
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,7 @@ if ARCH_S5PV210
|
||||||
config CPU_S5PV210
|
config CPU_S5PV210
|
||||||
bool
|
bool
|
||||||
select PLAT_S5P
|
select PLAT_S5P
|
||||||
|
select S3C_PL330_DMA
|
||||||
help
|
help
|
||||||
Enable S5PV210 CPU support
|
Enable S5PV210 CPU support
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ obj- :=
|
||||||
|
|
||||||
# Core support for S5PV210 system
|
# Core support for S5PV210 system
|
||||||
|
|
||||||
obj-$(CONFIG_CPU_S5PV210) += cpu.o init.o clock.o gpiolib.o
|
obj-$(CONFIG_CPU_S5PV210) += cpu.o init.o clock.o dma.o gpiolib.o
|
||||||
|
|
||||||
# machine support
|
# machine support
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,168 @@
|
||||||
|
/*
|
||||||
|
* 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 s5pv210_pdma0_resource[] = {
|
||||||
|
[0] = {
|
||||||
|
.start = S5PV210_PA_PDMA0,
|
||||||
|
.end = S5PV210_PA_PDMA0 + SZ_4K,
|
||||||
|
.flags = IORESOURCE_MEM,
|
||||||
|
},
|
||||||
|
[1] = {
|
||||||
|
.start = IRQ_PDMA0,
|
||||||
|
.end = IRQ_PDMA0,
|
||||||
|
.flags = IORESOURCE_IRQ,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct s3c_pl330_platdata s5pv210_pdma0_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_I2S0_RX,
|
||||||
|
[10] = DMACH_I2S0_TX,
|
||||||
|
[11] = DMACH_I2S0S_TX,
|
||||||
|
[12] = DMACH_I2S1_RX,
|
||||||
|
[13] = DMACH_I2S1_TX,
|
||||||
|
[14] = DMACH_MAX,
|
||||||
|
[15] = DMACH_MAX,
|
||||||
|
[16] = DMACH_SPI0_RX,
|
||||||
|
[17] = DMACH_SPI0_TX,
|
||||||
|
[18] = DMACH_SPI1_RX,
|
||||||
|
[19] = DMACH_SPI1_TX,
|
||||||
|
[20] = DMACH_MAX,
|
||||||
|
[21] = DMACH_MAX,
|
||||||
|
[22] = DMACH_AC97_MICIN,
|
||||||
|
[23] = DMACH_AC97_PCMIN,
|
||||||
|
[24] = DMACH_AC97_PCMOUT,
|
||||||
|
[25] = DMACH_MAX,
|
||||||
|
[26] = DMACH_PWM,
|
||||||
|
[27] = DMACH_SPDIF,
|
||||||
|
[28] = DMACH_MAX,
|
||||||
|
[29] = DMACH_MAX,
|
||||||
|
[30] = DMACH_MAX,
|
||||||
|
[31] = DMACH_MAX,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct platform_device s5pv210_device_pdma0 = {
|
||||||
|
.name = "s3c-pl330",
|
||||||
|
.id = 1,
|
||||||
|
.num_resources = ARRAY_SIZE(s5pv210_pdma0_resource),
|
||||||
|
.resource = s5pv210_pdma0_resource,
|
||||||
|
.dev = {
|
||||||
|
.dma_mask = &dma_dmamask,
|
||||||
|
.coherent_dma_mask = DMA_BIT_MASK(32),
|
||||||
|
.platform_data = &s5pv210_pdma0_pdata,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct resource s5pv210_pdma1_resource[] = {
|
||||||
|
[0] = {
|
||||||
|
.start = S5PV210_PA_PDMA1,
|
||||||
|
.end = S5PV210_PA_PDMA1 + SZ_4K,
|
||||||
|
.flags = IORESOURCE_MEM,
|
||||||
|
},
|
||||||
|
[1] = {
|
||||||
|
.start = IRQ_PDMA1,
|
||||||
|
.end = IRQ_PDMA1,
|
||||||
|
.flags = IORESOURCE_IRQ,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct s3c_pl330_platdata s5pv210_pdma1_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_I2S0_RX,
|
||||||
|
[10] = DMACH_I2S0_TX,
|
||||||
|
[11] = DMACH_I2S0S_TX,
|
||||||
|
[12] = DMACH_I2S1_RX,
|
||||||
|
[13] = DMACH_I2S1_TX,
|
||||||
|
[14] = DMACH_I2S2_RX,
|
||||||
|
[15] = DMACH_I2S2_TX,
|
||||||
|
[16] = DMACH_SPI0_RX,
|
||||||
|
[17] = DMACH_SPI0_TX,
|
||||||
|
[18] = DMACH_SPI1_RX,
|
||||||
|
[19] = DMACH_SPI1_TX,
|
||||||
|
[20] = DMACH_MAX,
|
||||||
|
[21] = DMACH_MAX,
|
||||||
|
[22] = DMACH_PCM0_RX,
|
||||||
|
[23] = DMACH_PCM0_TX,
|
||||||
|
[24] = DMACH_PCM1_RX,
|
||||||
|
[25] = DMACH_PCM1_TX,
|
||||||
|
[26] = DMACH_MSM_REQ0,
|
||||||
|
[27] = DMACH_MSM_REQ1,
|
||||||
|
[28] = DMACH_MSM_REQ2,
|
||||||
|
[29] = DMACH_MSM_REQ3,
|
||||||
|
[30] = DMACH_PCM2_RX,
|
||||||
|
[31] = DMACH_PCM2_TX,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct platform_device s5pv210_device_pdma1 = {
|
||||||
|
.name = "s3c-pl330",
|
||||||
|
.id = 2,
|
||||||
|
.num_resources = ARRAY_SIZE(s5pv210_pdma1_resource),
|
||||||
|
.resource = s5pv210_pdma1_resource,
|
||||||
|
.dev = {
|
||||||
|
.dma_mask = &dma_dmamask,
|
||||||
|
.coherent_dma_mask = DMA_BIT_MASK(32),
|
||||||
|
.platform_data = &s5pv210_pdma1_pdata,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct platform_device *s5pv210_dmacs[] __initdata = {
|
||||||
|
&s5pv210_device_pdma0,
|
||||||
|
&s5pv210_device_pdma1,
|
||||||
|
};
|
||||||
|
|
||||||
|
static int __init s5pv210_dma_init(void)
|
||||||
|
{
|
||||||
|
platform_add_devices(s5pv210_dmacs, ARRAY_SIZE(s5pv210_dmacs));
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
arch_initcall(s5pv210_dma_init);
|
|
@ -0,0 +1,26 @@
|
||||||
|
/*
|
||||||
|
* 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 */
|
|
@ -43,6 +43,10 @@
|
||||||
|
|
||||||
#define S5PV210_PA_SROMC (0xE8000000)
|
#define S5PV210_PA_SROMC (0xE8000000)
|
||||||
|
|
||||||
|
#define S5PV210_PA_MDMA 0xFA200000
|
||||||
|
#define S5PV210_PA_PDMA0 0xE0900000
|
||||||
|
#define S5PV210_PA_PDMA1 0xE0A00000
|
||||||
|
|
||||||
#define S5PV210_PA_VIC0 (0xF2000000)
|
#define S5PV210_PA_VIC0 (0xF2000000)
|
||||||
#define S5P_PA_VIC0 S5PV210_PA_VIC0
|
#define S5P_PA_VIC0 S5PV210_PA_VIC0
|
||||||
|
|
||||||
|
|
|
@ -203,6 +203,12 @@ config S3C_DMA
|
||||||
help
|
help
|
||||||
Internal configuration for S3C DMA core
|
Internal configuration for S3C DMA core
|
||||||
|
|
||||||
|
config S3C_PL330_DMA
|
||||||
|
bool
|
||||||
|
select PL330
|
||||||
|
help
|
||||||
|
S3C DMA API Driver for PL330 DMAC.
|
||||||
|
|
||||||
comment "Power management"
|
comment "Power management"
|
||||||
|
|
||||||
config SAMSUNG_PM_DEBUG
|
config SAMSUNG_PM_DEBUG
|
||||||
|
|
|
@ -46,6 +46,8 @@ obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o
|
||||||
|
|
||||||
obj-$(CONFIG_S3C_DMA) += dma.o
|
obj-$(CONFIG_S3C_DMA) += dma.o
|
||||||
|
|
||||||
|
obj-$(CONFIG_S3C_PL330_DMA) += s3c-pl330.o
|
||||||
|
|
||||||
# PM support
|
# PM support
|
||||||
|
|
||||||
obj-$(CONFIG_PM) += pm.o
|
obj-$(CONFIG_PM) += pm.o
|
||||||
|
|
|
@ -0,0 +1,78 @@
|
||||||
|
/*
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef __S3C_DMA_PL330_H_
|
||||||
|
#define __S3C_DMA_PL330_H_
|
||||||
|
|
||||||
|
#define S3C2410_DMAF_AUTOSTART (1 << 0)
|
||||||
|
#define S3C2410_DMAF_CIRCULAR (1 << 1)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* PL330 can assign any channel to communicate with
|
||||||
|
* any of the peripherals attched to the DMAC.
|
||||||
|
* For the sake of consistency across client drivers,
|
||||||
|
* We keep the channel names unchanged and only add
|
||||||
|
* missing peripherals are added.
|
||||||
|
* Order is not important since S3C PL330 API driver
|
||||||
|
* use these just as IDs.
|
||||||
|
*/
|
||||||
|
enum dma_ch {
|
||||||
|
DMACH_UART0_RX,
|
||||||
|
DMACH_UART0_TX,
|
||||||
|
DMACH_UART1_RX,
|
||||||
|
DMACH_UART1_TX,
|
||||||
|
DMACH_UART2_RX,
|
||||||
|
DMACH_UART2_TX,
|
||||||
|
DMACH_UART3_RX,
|
||||||
|
DMACH_UART3_TX,
|
||||||
|
DMACH_IRDA,
|
||||||
|
DMACH_I2S0_RX,
|
||||||
|
DMACH_I2S0_TX,
|
||||||
|
DMACH_I2S0S_TX,
|
||||||
|
DMACH_I2S1_RX,
|
||||||
|
DMACH_I2S1_TX,
|
||||||
|
DMACH_I2S2_RX,
|
||||||
|
DMACH_I2S2_TX,
|
||||||
|
DMACH_SPI0_RX,
|
||||||
|
DMACH_SPI0_TX,
|
||||||
|
DMACH_SPI1_RX,
|
||||||
|
DMACH_SPI1_TX,
|
||||||
|
DMACH_SPI2_RX,
|
||||||
|
DMACH_SPI2_TX,
|
||||||
|
DMACH_AC97_MICIN,
|
||||||
|
DMACH_AC97_PCMIN,
|
||||||
|
DMACH_AC97_PCMOUT,
|
||||||
|
DMACH_EXTERNAL,
|
||||||
|
DMACH_PWM,
|
||||||
|
DMACH_SPDIF,
|
||||||
|
DMACH_HSI_RX,
|
||||||
|
DMACH_HSI_TX,
|
||||||
|
DMACH_PCM0_TX,
|
||||||
|
DMACH_PCM0_RX,
|
||||||
|
DMACH_PCM1_TX,
|
||||||
|
DMACH_PCM1_RX,
|
||||||
|
DMACH_PCM2_TX,
|
||||||
|
DMACH_PCM2_RX,
|
||||||
|
DMACH_MSM_REQ3,
|
||||||
|
DMACH_MSM_REQ2,
|
||||||
|
DMACH_MSM_REQ1,
|
||||||
|
DMACH_MSM_REQ0,
|
||||||
|
/* END Marker, also used to denote a reserved channel */
|
||||||
|
DMACH_MAX,
|
||||||
|
};
|
||||||
|
|
||||||
|
static inline bool s3c_dma_has_circular(void)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
#include <plat/dma.h>
|
||||||
|
|
||||||
|
#endif /* __S3C_DMA_PL330_H_ */
|
|
@ -0,0 +1,32 @@
|
||||||
|
/* linux/arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h
|
||||||
|
*
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef __S3C_PL330_PDATA_H
|
||||||
|
#define __S3C_PL330_PDATA_H
|
||||||
|
|
||||||
|
#include <plat/s3c-dma-pl330.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Every PL330 DMAC has max 32 peripheral interfaces,
|
||||||
|
* of which some may be not be really used in your
|
||||||
|
* DMAC's configuration.
|
||||||
|
* Populate this array of 32 peri i/fs with relevant
|
||||||
|
* channel IDs for used peri i/f and DMACH_MAX for
|
||||||
|
* those unused.
|
||||||
|
*
|
||||||
|
* The platforms just need to provide this info
|
||||||
|
* to the S3C DMA API driver for PL330.
|
||||||
|
*/
|
||||||
|
struct s3c_pl330_platdata {
|
||||||
|
enum dma_ch peri[32];
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif /* __S3C_PL330_PDATA_H */
|
File diff suppressed because it is too large
Load Diff
Reference in New Issue