diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2013-04-08 18:10:13 +0200 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-04-08 18:10:13 +0200 |
| commit | da821eb7d42935b0f7056d98c75fd1150f6636f4 (patch) | |
| tree | de83ac171d51bbe7621110c3145a68c198b13711 /arch/arm/boot/dts/exynos5440.dtsi | |
| parent | ARM: EXYNOS: fix compilation error introduced due to common clock migration (diff) | |
| parent | Linux 3.9-rc5 (diff) | |
| download | linux-da821eb7d42935b0f7056d98c75fd1150f6636f4.tar.xz linux-da821eb7d42935b0f7056d98c75fd1150f6636f4.zip | |
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.dtsi | 6 |
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>; }; }; |