diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-30 09:31:49 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-30 09:32:24 -0800 |
| commit | 79870b7bca5a23c4b263b9a3335c67f1a7829f3e (patch) | |
| tree | 718eba8d974102a708acc2ccfb62834a271eadc9 /arch/arm/mach-exynos/mach-exynos4-dt.c | |
| parent | 52dddfe9fe81a50482e1313f4e55b19e8331dad4 (diff) | |
| parent | f7e758af0b10fb7d5a36279938a2e77aea50f801 (diff) | |
| download | blackbird-op-linux-79870b7bca5a23c4b263b9a3335c67f1a7829f3e.tar.gz blackbird-op-linux-79870b7bca5a23c4b263b9a3335c67f1a7829f3e.zip | |
Merge branch 'next/devel-samsung-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc
From Kukjin Kim:
This is including Samsung small updates(developments) for v3.8.
Add node PL330 MDMA1 and UART3 for DEBUG_LL and secondary cpu bring-up
for exynos4412.
* 'next/devel-samsung-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: add node for PL330 MDMA1 controller for exynos4
ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412
ARM: EXYNOS: add UART3 to DEBUG_LL ports
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-exynos/mach-exynos4-dt.c')
| -rw-r--r-- | arch/arm/mach-exynos/mach-exynos4-dt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c index eadf4b59e7d2..6df99c06419d 100644 --- a/arch/arm/mach-exynos/mach-exynos4-dt.c +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c @@ -77,6 +77,7 @@ static const struct of_dev_auxdata exynos4_auxdata_lookup[] __initconst = { "exynos4210-spi.2", NULL), OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA0, "dma-pl330.0", NULL), OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA1, "dma-pl330.1", NULL), + OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_MDMA1, "dma-pl330.2", NULL), {}, }; |
