diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-03-01 02:16:51 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-03-01 02:16:51 +0300 |
| commit | 53b28f1c642b92ad356a0766924ac04e53987b84 (patch) | |
| tree | 5501ba8b9c1c3623ce1be19c885824b92de6555e | |
| parent | 8898cb4115ad40f74ff769117295fc2c1d166da1 (diff) | |
| parent | 07c6b2d01d351f0512ed7145625265e435ab3240 (diff) | |
| download | linux-53b28f1c642b92ad356a0766924ac04e53987b84.tar.xz | |
Merge tag 'pxa-dt-4.6' of https://github.com/rjarzmik/linux into next/dt
Merge pxa dt for v4.6 from Robert Jarzmik:
This device-tree pxa update brings :
- a single fix for nand dmaengine node
* tag 'pxa-dt-4.6' of https://github.com/rjarzmik/linux:
ARM: dts: pxa: fix dma engine node to pxa3xx-nand
| -rw-r--r-- | arch/arm/boot/dts/pxa3xx.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi index cf6998a0804d..564341af7e97 100644 --- a/arch/arm/boot/dts/pxa3xx.dtsi +++ b/arch/arm/boot/dts/pxa3xx.dtsi @@ -30,7 +30,7 @@ reg = <0x43100000 90>; interrupts = <45>; clocks = <&clks CLK_NAND>; - dmas = <&pdma 97>; + dmas = <&pdma 97 3>; dma-names = "data"; #address-cells = <1>; #size-cells = <1>; |