From patchwork Fri Jun 5 15:34:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 6556181 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E68CD9F326 for ; Fri, 5 Jun 2015 15:35:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 07C1E2067D for ; Fri, 5 Jun 2015 15:35:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BECB0206D9 for ; Fri, 5 Jun 2015 15:35:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423498AbbFEPe4 (ORCPT ); Fri, 5 Jun 2015 11:34:56 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:59918 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751963AbbFEPex (ORCPT ); Fri, 5 Jun 2015 11:34:53 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id t55FYgls003051; Fri, 5 Jun 2015 10:34:42 -0500 Received: from DLEE70.ent.ti.com (dlemailx.itg.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id t55FYgOs023127; Fri, 5 Jun 2015 10:34:42 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.224.2; Fri, 5 Jun 2015 10:34:41 -0500 Received: from dflp32.itg.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id t55FYZ3u026256; Fri, 5 Jun 2015 10:34:39 -0500 From: Peter Ujfalusi To: , Tony Lindgren , , , CC: , , , , Subject: [PATCH 1/3] dmaengine: ti-dma-crossbar: Change the compatible string to ti, dra7-sdma-crossbar Date: Fri, 5 Jun 2015 18:34:32 +0300 Message-ID: <1433518474-26628-2-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.4.2 In-Reply-To: <1433518474-26628-1-git-send-email-peter.ujfalusi@ti.com> References: <1433518474-26628-1-git-send-email-peter.ujfalusi@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 Currently the driver can be used with sDMA only due to the fact that the sDMA bindings are using "real DMA_REQ + 1" indexing of the DMA requests. This is not a case with the eDMA for example so the driver in current form can not handle the case when it is used with eDMA. Be precise with the compatible. Signed-off-by: Peter Ujfalusi --- Documentation/devicetree/bindings/dma/dma.txt | 2 +- Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt | 4 ++-- drivers/dma/ti-dma-crossbar.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/dma.txt b/Documentation/devicetree/bindings/dma/dma.txt index 6312fb00ce8d..2ba51ca37cda 100644 --- a/Documentation/devicetree/bindings/dma/dma.txt +++ b/Documentation/devicetree/bindings/dma/dma.txt @@ -52,7 +52,7 @@ Optional properties: Example: sdma_xbar: dma-router@4a002b78 { - compatible = "ti,dra7-dma-crossbar"; + compatible = "ti,dra7-sdma-crossbar"; reg = <0x4a002b78 0xfc>; #dma-cells = <1>; dma-requests = <205>; diff --git a/Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt b/Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt index 63a48928f3a8..76a10d0724b7 100644 --- a/Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt +++ b/Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt @@ -1,7 +1,7 @@ Texas Instruments DMA Crossbar (DMA request router) Required properties: -- compatible: "ti,dra7-dma-crossbar" for DRA7xx DMA crossbar +- compatible: "ti,dra7-sdma-crossbar" for DRA7xx sDMA crossbar - reg: Memory map for accessing module - #dma-cells: Should be set to <1>. Clients should use the crossbar request number (input) @@ -31,7 +31,7 @@ sdma: dma-controller@4a056000 { /* DMA crossbar */ sdma_xbar: dma-router@4a002b78 { - compatible = "ti,dra7-dma-crossbar"; + compatible = "ti,dra7-sdma-crossbar"; reg = <0x4a002b78 0xfc>; #dma-cells = <1>; dma-requests = <205>; diff --git a/drivers/dma/ti-dma-crossbar.c b/drivers/dma/ti-dma-crossbar.c index 24f5ca2356bf..73ecd0a1e312 100644 --- a/drivers/dma/ti-dma-crossbar.c +++ b/drivers/dma/ti-dma-crossbar.c @@ -169,7 +169,7 @@ static int ti_dma_xbar_probe(struct platform_device *pdev) } static const struct of_device_id ti_dma_xbar_match[] = { - { .compatible = "ti,dra7-dma-crossbar" }, + { .compatible = "ti,dra7-sdma-crossbar" }, {}, };