From fafb2111b32e20518a7858921b4983d5d666cd2c Mon Sep 17 00:00:00 2001 From: Subash Patel Date: Fri, 5 Apr 2013 15:22:58 +0900 Subject: [PATCH] --- yaml --- r: 374115 b: refs/heads/master c: 58a7bbf75442ea439a4d3b7993ad87023e406063 h: refs/heads/master i: 374113: 55f43aaff0f70e69d2069c4b41a37a7e88f840aa 374111: 86e28cfaa5f51f89271f33548a641e392c573b29 v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/exynos5440.dtsi | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index c39ffbc32cd0..82d3023e63d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f7b8ed01a93a801659766dee218ee5bfe9d7d88 +refs/heads/master: 58a7bbf75442ea439a4d3b7993ad87023e406063 diff --git a/trunk/arch/arm/boot/dts/exynos5440.dtsi b/trunk/arch/arm/boot/dts/exynos5440.dtsi index f32b6fe6bd10..93e9028edaaf 100644 --- a/trunk/arch/arm/boot/dts/exynos5440.dtsi +++ b/trunk/arch/arm/boot/dts/exynos5440.dtsi @@ -185,22 +185,22 @@ interrupt-parent = <&gic>; ranges; - pdma0: pdma@121A0000 { + pdma0: pdma@00121000 { compatible = "arm,pl330", "arm,primecell"; - reg = <0x120000 0x1000>; - interrupts = <0 34 0>; - clocks = <&clock 21>; + reg = <0x121000 0x1000>; + interrupts = <0 46 0>; + clocks = <&clock 8>; clock-names = "apb_pclk"; #dma-cells = <1>; #dma-channels = <8>; #dma-requests = <32>; }; - pdma1: pdma@121B0000 { + pdma1: pdma@00120000 { compatible = "arm,pl330", "arm,primecell"; - reg = <0x121000 0x1000>; - interrupts = <0 35 0>; - clocks = <&clock 21>; + reg = <0x120000 0x1000>; + interrupts = <0 47 0>; + clocks = <&clock 8>; clock-names = "apb_pclk"; #dma-cells = <1>; #dma-channels = <8>;