From 5e106ae7677828ac3e0f354c01f7eb8c1e45ed44 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sat, 24 Nov 2012 11:12:50 +0900 Subject: [PATCH] --- yaml --- r: 340151 b: refs/heads/master c: f7e758af0b10fb7d5a36279938a2e77aea50f801 h: refs/heads/master i: 340149: 0ef96a9c1c75cb9201b588615731ae1c0b6e432d 340147: c4e1f517bec45b049b439efa7f0c4c302692e403 340143: 45a1b1bf0ef3129459d5fb42b8aafe88f55e2cb8 v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/exynos4.dtsi | 6 ++++++ trunk/arch/arm/mach-exynos/mach-exynos4-dt.c | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d79063036dcf..8b927cd73ef0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f054f52ee7c4f62b4ea352e95943f032d19cc15 +refs/heads/master: f7e758af0b10fb7d5a36279938a2e77aea50f801 diff --git a/trunk/arch/arm/boot/dts/exynos4.dtsi b/trunk/arch/arm/boot/dts/exynos4.dtsi index a26c3dd58269..96d4462730fb 100644 --- a/trunk/arch/arm/boot/dts/exynos4.dtsi +++ b/trunk/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>; + }; }; }; diff --git a/trunk/arch/arm/mach-exynos/mach-exynos4-dt.c b/trunk/arch/arm/mach-exynos/mach-exynos4-dt.c index eadf4b59e7d2..6df99c06419d 100644 --- a/trunk/arch/arm/mach-exynos/mach-exynos4-dt.c +++ b/trunk/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), {}, };