Subject: [PATCH v5 8/8] ARM: DTS: dra7x: Integrate sDMA crossbar

From: [email-masked] (Tony Lindgren)
Date: Thu, 9 Apr 2015 08:18:46 -0700

* Peter Ujfalusi <[email-masked]> [150409 02:37]:
> The sDMA requests are routed through the DMA crossbar and without the
> crossbar only peripherals using DMA request 0-127 can be used.

I assume this can be merged separately from the driver
changes?

Otherwise we'll have the same kind of "flag day" mess with
the IRQ crossbar..

Regards,

Tony
 
> Signed-off-by: Peter Ujfalusi <[email-masked]>
> ---
>  arch/arm/boot/dts/dra7.dtsi | 57 ++++++++++++++++++++++++++-------------------
>  1 file changed, 33 insertions(+), 24 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
> index 5332b57b4950..a2f4aa01984f 100644
> --- a/arch/arm/boot/dts/dra7.dtsi
> +++ b/arch/arm/boot/dts/dra7.dtsi
> @@ -303,6 +303,15 @@
>  			dma-requests = <127>;
>  		};
>  
> +		sdma_xbar: dma-router at 4a002b78 {
> +			compatible = "ti,dra7-dma-crossbar";
> +			reg = <0x4a002b78 0xfc>;
> +			#dma-cells = <1>;
> +			dma-requests = <205>;
> +			ti,dma-safe-map = <0>;
> +			dma-masters = <&sdma>;
> +		};
> +
>  		gpio1: gpio at 4ae10000 {
>  			compatible = "ti,omap4-gpio";
>  			reg = <0x4ae10000 0x200>;
> @@ -398,7 +407,7 @@
>  			ti,hwmods = "uart1";
>  			clock-frequency = <48000000>;
>  			status = "disabled";
> -			dmas = <&sdma 49>, <&sdma 50>;
> +			dmas = <&sdma_xbar 49>, <&sdma_xbar 50>;
>  			dma-names = "tx", "rx";
>  		};
>  
> @@ -409,7 +418,7 @@
>  			ti,hwmods = "uart2";
>  			clock-frequency = <48000000>;
>  			status = "disabled";
> -			dmas = <&sdma 51>, <&sdma 52>;
> +			dmas = <&sdma_xbar 51>, <&sdma_xbar 52>;
>  			dma-names = "tx", "rx";
>  		};
>  
> @@ -420,7 +429,7 @@
>  			ti,hwmods = "uart3";
>  			clock-frequency = <48000000>;
>  			status = "disabled";
> -			dmas = <&sdma 53>, <&sdma 54>;
> +			dmas = <&sdma_xbar 53>, <&sdma_xbar 54>;
>  			dma-names = "tx", "rx";
>  		};
>  
> @@ -431,7 +440,7 @@
>  			ti,hwmods = "uart4";
>  			clock-frequency = <48000000>;
>                          status = "disabled";
> -			dmas = <&sdma 55>, <&sdma 56>;
> +			dmas = <&sdma_xbar 55>, <&sdma_xbar 56>;
>  			dma-names = "tx", "rx";
>  		};
>  
> @@ -442,7 +451,7 @@
>  			ti,hwmods = "uart5";
>  			clock-frequency = <48000000>;
>  			status = "disabled";
> -			dmas = <&sdma 63>, <&sdma 64>;
> +			dmas = <&sdma_xbar 63>, <&sdma_xbar 64>;
>  			dma-names = "tx", "rx";
>  		};
>  
> @@ -453,7 +462,7 @@
>  			ti,hwmods = "uart6";
>  			clock-frequency = <48000000>;
>  			status = "disabled";
> -			dmas = <&sdma 79>, <&sdma 80>;
> +			dmas = <&sdma_xbar 79>, <&sdma_xbar 80>;
>  			dma-names = "tx", "rx";
>  		};
>  
> @@ -862,7 +871,7 @@
>  			ti,hwmods = "mmc1";
>  			ti,dual-volt;
>  			ti,needs-special-reset;
> -			dmas = <&sdma 61>, <&sdma 62>;
> +			dmas = <&sdma_xbar 61>, <&sdma_xbar 62>;
>  			dma-names = "tx", "rx";
>  			status = "disabled";
>  			pbias-supply = <&pbias_mmc_reg>;
> @@ -874,7 +883,7 @@
>  			interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
>  			ti,hwmods = "mmc2";
>  			ti,needs-special-reset;
> -			dmas = <&sdma 47>, <&sdma 48>;
> +			dmas = <&sdma_xbar 47>, <&sdma_xbar 48>;
>  			dma-names = "tx", "rx";
>  			status = "disabled";
>  		};
> @@ -885,7 +894,7 @@
>  			interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
>  			ti,hwmods = "mmc3";
>  			ti,needs-special-reset;
> -			dmas = <&sdma 77>, <&sdma 78>;
> +			dmas = <&sdma_xbar 77>, <&sdma_xbar 78>;
>  			dma-names = "tx", "rx";
>  			status = "disabled";
>  		};
> @@ -896,7 +905,7 @@
>  			interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
>  			ti,hwmods = "mmc4";
>  			ti,needs-special-reset;
> -			dmas = <&sdma 57>, <&sdma 58>;
> +			dmas = <&sdma_xbar 57>, <&sdma_xbar 58>;
>  			dma-names = "tx", "rx";
>  			status = "disabled";
>  		};
> @@ -1041,14 +1050,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_xbar 35>,
> +			       <&sdma_xbar 36>,
> +			       <&sdma_xbar 37>,
> +			       <&sdma_xbar 38>,
> +			       <&sdma_xbar 39>,
> +			       <&sdma_xbar 40>,
> +			       <&sdma_xbar 41>,
> +			       <&sdma_xbar 42>;
>  			dma-names = "tx0", "rx0", "tx1", "rx1",
>  				    "tx2", "rx2", "tx3", "rx3";
>  			status = "disabled";
> @@ -1062,10 +1071,10 @@
>  			#size-cells = <0>;
>  			ti,hwmods = "mcspi2";
>  			ti,spi-num-cs = <2>;
> -			dmas = <&sdma 43>,
> -			       <&sdma 44>,
> -			       <&sdma 45>,
> -			       <&sdma 46>;
> +			dmas = <&sdma_xbar 43>,
> +			       <&sdma_xbar 44>,
> +			       <&sdma_xbar 45>,
> +			       <&sdma_xbar 46>;
>  			dma-names = "tx0", "rx0", "tx1", "rx1";
>  			status = "disabled";
>  		};
> @@ -1078,7 +1087,7 @@
>  			#size-cells = <0>;
>  			ti,hwmods = "mcspi3";
>  			ti,spi-num-cs = <2>;
> -			dmas = <&sdma 15>, <&sdma 16>;
> +			dmas = <&sdma_xbar 15>, <&sdma_xbar 16>;
>  			dma-names = "tx0", "rx0";
>  			status = "disabled";
>  		};
> @@ -1091,7 +1100,7 @@
>  			#size-cells = <0>;
>  			ti,hwmods = "mcspi4";
>  			ti,spi-num-cs = <1>;
> -			dmas = <&sdma 70>, <&sdma 71>;
> +			dmas = <&sdma_xbar 70>, <&sdma_xbar 71>;
>  			dma-names = "tx0", "rx0";
>  			status = "disabled";
>  		};
> -- 
> 2.3.5
>