From patchwork Wed Apr 17 14:02:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 16170 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gh0-f200.google.com (mail-gh0-f200.google.com [209.85.160.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 105A823911 for ; Wed, 17 Apr 2013 14:02:59 +0000 (UTC) Received: by mail-gh0-f200.google.com with SMTP id 10sf64913ghy.3 for ; Wed, 17 Apr 2013 07:02:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=CAiFGvhO0Eaw2Tt7zK8kQDYBp/CCp8EHkd2P5yDK3yo=; b=E0c/1Pya6e1WdppFBaNIKLgpBWD+XZuDLV/ZZq7YJFvC4xSpce5CjnRF0zvWmvxjQy UiKxOtJefUpMJSb6C4eWWbLxKfPho1V1VRTtnMvPvKPuLXpcKY/uTBHIsnup93sbkF2W ktBg9v5nBJSVLOBDG6DpYkvvQTcCq0kufko6Bs1PQJ41My1I8VXNX+XnKiBLYKoHdPSX k1hw7bSUtDcgS4JCVynyfkUqYWNQg5EkmdAEAqstDN64aZnTbYfse5G5EW8h+JQ9LG1w xRGU66XrEf0KaYhyf+IkvFdqjZ0V5VxWFHaDMWrOqZaPMb4Ial6tfNS8jBk88cbgOCxD ZWTg== X-Received: by 10.236.139.230 with SMTP id c66mr3256373yhj.55.1366207343673; Wed, 17 Apr 2013 07:02:23 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.71.141 with SMTP id v13ls959969qeu.84.gmail; Wed, 17 Apr 2013 07:02:23 -0700 (PDT) X-Received: by 10.52.120.8 with SMTP id ky8mr4224171vdb.128.1366207343458; Wed, 17 Apr 2013 07:02:23 -0700 (PDT) Received: from mail-vb0-x233.google.com (mail-vb0-x233.google.com [2607:f8b0:400c:c02::233]) by mx.google.com with ESMTPS id fe2si3974121vcb.50.2013.04.17.07.02.23 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 17 Apr 2013 07:02:23 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::233 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::233; Received: by mail-vb0-f51.google.com with SMTP id x19so1260135vbf.24 for ; Wed, 17 Apr 2013 07:02:23 -0700 (PDT) X-Received: by 10.52.166.103 with SMTP id zf7mr4217819vdb.94.1366207343306; Wed, 17 Apr 2013 07:02:23 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp75143veb; Wed, 17 Apr 2013 07:02:22 -0700 (PDT) X-Received: by 10.180.109.196 with SMTP id hu4mr5688723wib.27.1366207342083; Wed, 17 Apr 2013 07:02:22 -0700 (PDT) Received: from mail-wi0-x234.google.com (mail-wi0-x234.google.com [2a00:1450:400c:c05::234]) by mx.google.com with ESMTPS id ls4si2173845wjb.96.2013.04.17.07.02.21 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 17 Apr 2013 07:02:22 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c05::234 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c05::234; Received: by mail-wi0-f180.google.com with SMTP id h11so493663wiv.1 for ; Wed, 17 Apr 2013 07:02:21 -0700 (PDT) X-Received: by 10.194.158.161 with SMTP id wv1mr11629274wjb.38.1366207341399; Wed, 17 Apr 2013 07:02:21 -0700 (PDT) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id dm9sm25751524wib.3.2013.04.17.07.02.19 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 17 Apr 2013 07:02:20 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones Subject: [PATCH] dw_dmac: Couple of small fixups; use of '_' over '-' and a cell-num typo Date: Wed, 17 Apr 2013 15:02:10 +0100 Message-Id: <1366207330-1727-1-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQlX49FftqbwvE42KPzSBg3el9aVxlmnikn8SyhzIYd8OWXX6mXTdWlG5q7UrAGJLeAesWSF X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::233 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , In Device Tree '-' is always preferred over '_'. This is corrected in code as well as in the documentation. Also, there are one too many populated cells in the dmas example. Let's remove one of them to aid with clarity. Signed-off-by: Lee Jones --- Documentation/devicetree/bindings/dma/snps-dma.txt | 4 ++-- drivers/dma/dw_dmac.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/snps-dma.txt b/Documentation/devicetree/bindings/dma/snps-dma.txt index d58675e..aaccb9d 100644 --- a/Documentation/devicetree/bindings/dma/snps-dma.txt +++ b/Documentation/devicetree/bindings/dma/snps-dma.txt @@ -20,7 +20,7 @@ Required properties: Optional properties: - interrupt-parent: Should be the phandle for the interrupt controller that services interrupts for this device -- is_private: The device channels should be marked as private and not for by the +- is-private: The device channels should be marked as private and not for by the general purpose DMA channel allocator. False if not passed. Example: @@ -58,6 +58,6 @@ Example: interrupts = <0 35 0x4>; status = "disabled"; dmas = <&dmahost 12 0 1>, - <&dmahost 13 0 1 0>; + <&dmahost 13 0 1>; dma-names = "rx", "rx"; }; diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c index c599558..3448819 100644 --- a/drivers/dma/dw_dmac.c +++ b/drivers/dma/dw_dmac.c @@ -1592,7 +1592,7 @@ dw_dma_parse_dt(struct platform_device *pdev) if (of_property_read_u32(np, "dma-channels", &pdata->nr_channels)) return NULL; - if (of_property_read_bool(np, "is_private")) + if (of_property_read_bool(np, "is-private")) pdata->is_private = true; if (!of_property_read_u32(np, "chan_allocation_order", &tmp))