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/boot | |
| parent | Merge branch 'next/pinctrl-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc (diff) | |
| parent | ARM: dts: add node for PL330 MDMA1 controller for exynos4 (diff) | |
| download | linux-dev-79870b7bca5a23c4b263b9a3335c67f1a7829f3e.tar.xz linux-dev-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/boot')
| -rw-r--r-- | arch/arm/boot/dts/exynos4.dtsi | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index a26c3dd58269..96d4462730fb 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -244,5 +244,11 @@ reg = <0x12690000 0x1000>; interrupts = <0 36 0>; }; + + mdma1: mdma@12850000 { + compatible = "arm,pl330", "arm,primecell"; + reg = <0x12850000 0x1000>; + interrupts = <0 34 0>; + }; }; }; |