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

arch/arm/boot/dts/pxa3xx.dtsi

@@ -30,7 +30,7 @@ nand0: nand@43100000 {
 			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>;