From patchwork Fri Mar 7 12:16:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: R Sricharan X-Patchwork-Id: 3790311 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 29CEFBF549 for ; Fri, 7 Mar 2014 12:18:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3FEAA20274 for ; Fri, 7 Mar 2014 12:18:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5333C202B4 for ; Fri, 7 Mar 2014 12:18:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753206AbaCGMRx (ORCPT ); Fri, 7 Mar 2014 07:17:53 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:57339 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753193AbaCGMRu (ORCPT ); Fri, 7 Mar 2014 07:17:50 -0500 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s27CHJet003706; Fri, 7 Mar 2014 06:17:19 -0600 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s27CHIan018197; Fri, 7 Mar 2014 06:17:18 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Fri, 7 Mar 2014 06:17:18 -0600 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s27CGhw4003967; Fri, 7 Mar 2014 06:17:14 -0600 From: Sricharan R To: , , , , , CC: , , , , , , , Subject: [RFC PATCH 7/9] arm: dts: dra: Add dma-request crossbar phandle to dma-specs Date: Fri, 7 Mar 2014 17:46:14 +0530 Message-ID: <1394194576-23741-8-git-send-email-r.sricharan@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1394194576-23741-1-git-send-email-r.sricharan@ti.com> References: <1394194576-23741-1-git-send-email-r.sricharan@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 @@ , , ; - #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 = ; 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 = ; 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 = ; 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"; };