aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/exynos5440.dtsi
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2013-04-09 01:10:13 +0900
committerKukjin Kim <kgene.kim@samsung.com>2013-04-09 01:10:13 +0900
commitda821eb7d42935b0f7056d98c75fd1150f6636f4 (patch)
treede83ac171d51bbe7621110c3145a68c198b13711 /arch/arm/boot/dts/exynos5440.dtsi
parent296f3f2c9322480400338f71d8c118107f9a7f20 (diff)
parent07961ac7c0ee8b546658717034fe692fd12eefa9 (diff)
downloadlinux-stericsson-da821eb7d42935b0f7056d98c75fd1150f6636f4.tar.gz
Merge commit 'v3.9-rc5' into next/clk-exynos
Conflicts: arch/arm/boot/dts/exynos4.dtsi arch/arm/boot/dts/exynos5440.dtsi
Diffstat (limited to 'arch/arm/boot/dts/exynos5440.dtsi')
-rw-r--r--arch/arm/boot/dts/exynos5440.dtsi6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi
index a54c4ab7bdf5..c374a31e9c3d 100644
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@ -154,6 +154,9 @@
interrupts = <0 34 0>;
clocks = <&clock 21>;
clock-names = "apb_pclk";
+ #dma-cells = <1>;
+ #dma-channels = <8>;
+ #dma-requests = <32>;
};
pdma1: pdma@121B0000 {
@@ -162,6 +165,9 @@
interrupts = <0 35 0>;
clocks = <&clock 21>;
clock-names = "apb_pclk";
+ #dma-cells = <1>;
+ #dma-channels = <8>;
+ #dma-requests = <32>;
};
};