The dma-request lines from peripherals are connected to the dma-controller through a crossbar router. Adding this crossbar phandle to the peripheral's dma-specs. This is used by the driver to identify the router associated with a dma-request line and map it. Signed-off-by: Sricharan R <r.sricharan@xxxxxx> --- arch/arm/boot/dts/dra7.dtsi | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index f84991b..baa781e 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -165,7 +165,7 @@ <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; - #dma-cells = <1>; + #dma-cells = <2>; #dma-channels = <32>; #dma-requests = <127>; }; @@ -528,7 +528,7 @@ ti,hwmods = "mmc1"; ti,dual-volt; ti,needs-special-reset; - dmas = <&sdma 61>, <&sdma 62>; + dmas = <&sdma 61 &dmacb>, <&sdma 62 &dmacb>; dma-names = "tx", "rx"; status = "disabled"; }; @@ -539,7 +539,7 @@ interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "mmc2"; ti,needs-special-reset; - dmas = <&sdma 47>, <&sdma 48>; + dmas = <&sdma 47 &dmacb>, <&sdma 48 &dmacb>; dma-names = "tx", "rx"; status = "disabled"; }; @@ -550,7 +550,7 @@ interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "mmc3"; ti,needs-special-reset; - dmas = <&sdma 77>, <&sdma 78>; + dmas = <&sdma 77 &dmacb>, <&sdma 78 &dmacb>; dma-names = "tx", "rx"; status = "disabled"; }; @@ -561,7 +561,7 @@ interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "mmc4"; ti,needs-special-reset; - dmas = <&sdma 57>, <&sdma 58>; + dmas = <&sdma 57 &dmacb>, <&sdma 58 &dmacb>; dma-names = "tx", "rx"; status = "disabled"; }; @@ -574,14 +574,14 @@ #size-cells = <0>; ti,hwmods = "mcspi1"; ti,spi-num-cs = <4>; - dmas = <&sdma 35>, - <&sdma 36>, - <&sdma 37>, - <&sdma 38>, - <&sdma 39>, - <&sdma 40>, - <&sdma 41>, - <&sdma 42>; + dmas = <&sdma 35 &dmacb>, + <&sdma 36 &dmacb>, + <&sdma 37 &dmacb>, + <&sdma 38 &dmacb>, + <&sdma 39 &dmacb>, + <&sdma 40 &dmacb>, + <&sdma 41 &dmacb>, + <&sdma 42 &dmacb>; dma-names = "tx0", "rx0", "tx1", "rx1", "tx2", "rx2", "tx3", "rx3"; status = "disabled"; @@ -595,10 +595,10 @@ #size-cells = <0>; ti,hwmods = "mcspi2"; ti,spi-num-cs = <2>; - dmas = <&sdma 43>, - <&sdma 44>, - <&sdma 45>, - <&sdma 46>; + dmas = <&sdma 43 &dmacb>, + <&sdma 44 &dmacb>, + <&sdma 45 &dmacb>, + <&sdma 46 &dmacb>; dma-names = "tx0", "rx0", "tx1", "rx1"; status = "disabled"; }; @@ -611,7 +611,7 @@ #size-cells = <0>; ti,hwmods = "mcspi3"; ti,spi-num-cs = <2>; - dmas = <&sdma 15>, <&sdma 16>; + dmas = <&sdma 15 &dmacb>, <&sdma 16 &dmacb>; dma-names = "tx0", "rx0"; status = "disabled"; }; @@ -624,7 +624,7 @@ #size-cells = <0>; ti,hwmods = "mcspi4"; ti,spi-num-cs = <1>; - dmas = <&sdma 70>, <&sdma 71>; + dmas = <&sdma 70 &dmacb>, <&sdma 71 &dmacb>; dma-names = "tx0", "rx0"; status = "disabled"; }; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
