From 829a2fac71b83c1689213337e8cfc58a9ea12211 Mon Sep 17 00:00:00 2001 From: Vinod Koul Date: Mon, 2 Nov 2015 21:06:46 +0530 Subject: [PATCH] Revert "ARM: DTS: am33xx: Use the new DT bindings for the eDMA3" This reverts commit d871cd2ec5abf8715774bcb90aa32ae5b750b587 as it causes regression in BBB Reported-by: Olof Johansson Signed-off-by: Vinod Koul --- arch/arm/boot/dts/am335x-evm.dts | 9 ++- arch/arm/boot/dts/am335x-pepper.dts | 11 +++- arch/arm/boot/dts/am33xx.dtsi | 96 ++++++++--------------------- 3 files changed, 43 insertions(+), 73 deletions(-) diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index 507980672c32..1942a5c8132d 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -743,8 +743,8 @@ &mmc3 { /* these are on the crossbar and are outlined in the xbar-event-map element */ - dmas = <&edma_xbar 12 0 1 - &edma_xbar 13 0 2>; + dmas = <&edma 12 + &edma 13>; dma-names = "tx", "rx"; status = "okay"; vmmc-supply = <&wlan_en_reg>; @@ -766,6 +766,11 @@ }; }; +&edma { + ti,edma-xbar-event-map = /bits/ 16 <1 12 + 2 13>; +}; + &sham { status = "okay"; }; diff --git a/arch/arm/boot/dts/am335x-pepper.dts b/arch/arm/boot/dts/am335x-pepper.dts index 39073b921664..7106114c7464 100644 --- a/arch/arm/boot/dts/am335x-pepper.dts +++ b/arch/arm/boot/dts/am335x-pepper.dts @@ -339,6 +339,13 @@ ti,non-removable; }; +&edma { + /* Map eDMA MMC2 Events from Crossbar */ + ti,edma-xbar-event-map = /bits/ 16 <1 12 + 2 13>; +}; + + &mmc3 { /* Wifi & Bluetooth on MMC #3 */ status = "okay"; @@ -347,8 +354,8 @@ vmmmc-supply = <&v3v3c_reg>; bus-width = <4>; ti,non-removable; - dmas = <&edma_xbar 12 0 1 - &edma_xbar 13 0 2>; + dmas = <&edma 12 + &edma 13>; dma-names = "tx", "rx"; }; diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index 6053e75c6e99..d23e2524d694 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -174,54 +174,12 @@ }; edma: edma@49000000 { - compatible = "ti,edma3-tpcc"; - ti,hwmods = "tpcc"; - reg = <0x49000000 0x10000>; - reg-names = "edma3_cc"; + compatible = "ti,edma3"; + ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2"; + reg = <0x49000000 0x10000>, + <0x44e10f90 0x40>; interrupts = <12 13 14>; - interrupt-names = "edma3_ccint", "emda3_mperr", - "edma3_ccerrint"; - dma-requests = <64>; - #dma-cells = <2>; - - ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 5>, - <&edma_tptc2 0>; - - ti,edma-memcpy-channels = /bits/ 16 <20 21>; - }; - - edma_tptc0: tptc@49800000 { - compatible = "ti,edma3-tptc"; - ti,hwmods = "tptc0"; - reg = <0x49800000 0x100000>; - interrupts = <112>; - interrupt-names = "edma3_tcerrint"; - }; - - edma_tptc1: tptc@49900000 { - compatible = "ti,edma3-tptc"; - ti,hwmods = "tptc1"; - reg = <0x49900000 0x100000>; - interrupts = <113>; - interrupt-names = "edma3_tcerrint"; - }; - - edma_tptc2: tptc@49a00000 { - compatible = "ti,edma3-tptc"; - ti,hwmods = "tptc2"; - reg = <0x49a00000 0x100000>; - interrupts = <114>; - interrupt-names = "edma3_tcerrint"; - }; - - edma_xbar: dma-router@44e10f90 { - compatible = "ti,am335x-edma-crossbar"; - reg = <0x44e10f90 0x40>; - - #dma-cells = <3>; - dma-requests = <32>; - - dma-masters = <&edma>; + #dma-cells = <1>; }; gpio0: gpio@44e07000 { @@ -275,7 +233,7 @@ reg = <0x44e09000 0x2000>; interrupts = <72>; status = "disabled"; - dmas = <&edma 26 0>, <&edma 27 0>; + dmas = <&edma 26>, <&edma 27>; dma-names = "tx", "rx"; }; @@ -286,7 +244,7 @@ reg = <0x48022000 0x2000>; interrupts = <73>; status = "disabled"; - dmas = <&edma 28 0>, <&edma 29 0>; + dmas = <&edma 28>, <&edma 29>; dma-names = "tx", "rx"; }; @@ -297,7 +255,7 @@ reg = <0x48024000 0x2000>; interrupts = <74>; status = "disabled"; - dmas = <&edma 30 0>, <&edma 31 0>; + dmas = <&edma 30>, <&edma 31>; dma-names = "tx", "rx"; }; @@ -364,8 +322,8 @@ ti,dual-volt; ti,needs-special-reset; ti,needs-special-hs-handling; - dmas = <&edma_xbar 24 0 0 - &edma_xbar 25 0 0>; + dmas = <&edma 24 + &edma 25>; dma-names = "tx", "rx"; interrupts = <64>; interrupt-parent = <&intc>; @@ -377,8 +335,8 @@ compatible = "ti,omap4-hsmmc"; ti,hwmods = "mmc2"; ti,needs-special-reset; - dmas = <&edma 2 0 - &edma 3 0>; + dmas = <&edma 2 + &edma 3>; dma-names = "tx", "rx"; interrupts = <28>; interrupt-parent = <&intc>; @@ -516,10 +474,10 @@ interrupts = <65>; ti,spi-num-cs = <2>; ti,hwmods = "spi0"; - dmas = <&edma 16 0 - &edma 17 0 - &edma 18 0 - &edma 19 0>; + dmas = <&edma 16 + &edma 17 + &edma 18 + &edma 19>; dma-names = "tx0", "rx0", "tx1", "rx1"; status = "disabled"; }; @@ -532,10 +490,10 @@ interrupts = <125>; ti,spi-num-cs = <2>; ti,hwmods = "spi1"; - dmas = <&edma 42 0 - &edma 43 0 - &edma 44 0 - &edma 45 0>; + dmas = <&edma 42 + &edma 43 + &edma 44 + &edma 45>; dma-names = "tx0", "rx0", "tx1", "rx1"; status = "disabled"; }; @@ -873,7 +831,7 @@ ti,hwmods = "sham"; reg = <0x53100000 0x200>; interrupts = <109>; - dmas = <&edma 36 0>; + dmas = <&edma 36>; dma-names = "rx"; }; @@ -882,8 +840,8 @@ ti,hwmods = "aes"; reg = <0x53500000 0xa0>; interrupts = <103>; - dmas = <&edma 6 0>, - <&edma 5 0>; + dmas = <&edma 6>, + <&edma 5>; dma-names = "tx", "rx"; }; @@ -896,8 +854,8 @@ interrupts = <80>, <81>; interrupt-names = "tx", "rx"; status = "disabled"; - dmas = <&edma 8 2>, - <&edma 9 2>; + dmas = <&edma 8>, + <&edma 9>; dma-names = "tx", "rx"; }; @@ -910,8 +868,8 @@ interrupts = <82>, <83>; interrupt-names = "tx", "rx"; status = "disabled"; - dmas = <&edma 10 2>, - <&edma 11 2>; + dmas = <&edma 10>, + <&edma 11>; dma-names = "tx", "rx"; }; -- 2.39.2