From patchwork Wed Mar 5 03:35:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Barry Song <21cnbao@gmail.com> X-Patchwork-Id: 3770161 Return-Path: X-Original-To: patchwork-linux-arm@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 1AC49BF13A for ; Wed, 5 Mar 2014 03:37:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 36D8120240 for ; Wed, 5 Mar 2014 03:37:27 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DE99C20237 for ; Wed, 5 Mar 2014 03:37:25 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WL2dI-0003UA-9i; Wed, 05 Mar 2014 03:36:36 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WL2dF-0007TK-I3; Wed, 05 Mar 2014 03:36:33 +0000 Received: from mail-pb0-f44.google.com ([209.85.160.44]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WL2dB-0007Sm-JH for linux-arm-kernel@lists.infradead.org; Wed, 05 Mar 2014 03:36:30 +0000 Received: by mail-pb0-f44.google.com with SMTP id rp16so484194pbb.3 for ; Tue, 04 Mar 2014 19:36:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=iCgDB7N7je6OrqBN2RFwfaCBdOUJaDNbIzv/XDDSkCM=; b=LjjLMqUhIhVw3eQWuSiNBCJQEgF/wdnHK0R4VP0EA556nriaCQC8fELAUXSBjGzPV8 vQTyHwojqyrRlCBaN1ilWIY0yWm3HFnd1muviPP56eBVeFBQufTauBYeeqT5S1nazyTp PTDKzYFaXLhHq25dZGo29NLp0KefWZ1DST+3GKlyJ9VvZT1kueRDqQ4/X3QJztS7fdZF JTcWg3FNosAzRAJ3Z0p9x5igb0kJOP5w5CjNoiyAtQ2hC+Pjqv6JaYpHfq3vcHFX4daD lvnMdqEhEnoqOlLM92hSVKzaicfFSSAalUhz0HrGseYEmERJUVn4+tGT6B9X/yCH9tnS JupQ== X-Received: by 10.68.139.100 with SMTP id qx4mr3869706pbb.144.1393990564763; Tue, 04 Mar 2014 19:36:04 -0800 (PST) Received: from barry-laptop.ROOT.PRI ([117.136.8.57]) by mx.google.com with ESMTPSA id f5sm5920012pat.11.2014.03.04.19.35.58 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Mar 2014 19:36:04 -0800 (PST) From: Barry Song <21cnbao@gmail.com> To: olof@lixom.net, arnd@arndb.de, khilman@linaro.org Subject: [PATCH 1/2] ARM: dts: sirf: move to use generic dma dt-binding for spi Date: Wed, 5 Mar 2014 11:35:34 +0800 Message-Id: <1393990536-9306-1-git-send-email-21cnbao@gmail.com> X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140304_223629_769970_B44733CE X-CRM114-Status: UNSURE ( 8.97 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.7 (--) Cc: Mark Brown , workgroup.linux@csr.com, linux-arm-kernel@lists.infradead.org, Barry Song X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 From: Barry Song This patch is following commit dd7243d6a5d in spi-next tree.in drivers/spi/ spi-sirf.c, we have moved to use generic dma dt-binding. here the dts should be changed too. Cc: Mark Brown Signed-off-by: Barry Song --- arch/arm/boot/dts/atlas6.dtsi | 11 ++++++----- arch/arm/boot/dts/prima2.dtsi | 10 ++++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/atlas6.dtsi b/arch/arm/boot/dts/atlas6.dtsi index 5d7879b..14495c4 100644 --- a/arch/arm/boot/dts/atlas6.dtsi +++ b/arch/arm/boot/dts/atlas6.dtsi @@ -293,9 +293,9 @@ reg = <0xb00d0000 0x10000>; interrupts = <15>; sirf,spi-num-chipselects = <1>; - cs-gpios = <&gpio 0 0>; - sirf,spi-dma-rx-channel = <25>; - sirf,spi-dma-tx-channel = <20>; + dmas = <&dmac1 9>, + <&dmac1 4>; + dma-names = "rx", "tx"; #address-cells = <1>; #size-cells = <0>; clocks = <&clks 19>; @@ -308,8 +308,9 @@ reg = <0xb0170000 0x10000>; interrupts = <16>; sirf,spi-num-chipselects = <1>; - sirf,spi-dma-rx-channel = <12>; - sirf,spi-dma-tx-channel = <13>; + dmas = <&dmac0 12>, + <&dmac0 13>; + dma-names = "rx", "tx"; #address-cells = <1>; #size-cells = <0>; clocks = <&clks 20>; diff --git a/arch/arm/boot/dts/prima2.dtsi b/arch/arm/boot/dts/prima2.dtsi index 0e21993..6423771 100644 --- a/arch/arm/boot/dts/prima2.dtsi +++ b/arch/arm/boot/dts/prima2.dtsi @@ -310,8 +310,9 @@ reg = <0xb00d0000 0x10000>; interrupts = <15>; sirf,spi-num-chipselects = <1>; - sirf,spi-dma-rx-channel = <25>; - sirf,spi-dma-tx-channel = <20>; + dmas = <&dmac1 9>, + <&dmac1 4>; + dma-names = "rx", "tx"; #address-cells = <1>; #size-cells = <0>; clocks = <&clks 19>; @@ -324,8 +325,9 @@ reg = <0xb0170000 0x10000>; interrupts = <16>; sirf,spi-num-chipselects = <1>; - sirf,spi-dma-rx-channel = <12>; - sirf,spi-dma-tx-channel = <13>; + dmas = <&dmac0 12>, + <&dmac0 13>; + dma-names = "rx", "tx"; #address-cells = <1>; #size-cells = <0>; clocks = <&clks 20>;