From patchwork Thu Jan 11 05:58:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 10157139 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 81636605BA for ; Thu, 11 Jan 2018 05:59:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7453E286BE for ; Thu, 11 Jan 2018 05:59:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 68FDB286C2; Thu, 11 Jan 2018 05:59:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0297D286BE for ; Thu, 11 Jan 2018 05:59:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=UgXj/JcBDD8Np3HhzCn5r2AxtrRnY2QLb44iySmzKGY=; b=CHRqdlBTJMGL/1mTnzPXR0W7iA wjkeGDfLTCxO1jLwMWpbjHizzUvADJjicN2HRnMMda2PnCpyX0cNSFioBuj9Q24zi16qUkUjZ1OSw /TIsJJNypnB/EhLnXLTXShCN2oCn4zHJIzzQVRR+YJzxLihH9tSEjKFDteqxkwaktYFg7dMDW3AyD Dc5BGVC9PTHFCRKoEoCnp0trKXd1wZdcHMgz+YXXCy5+wBegRsA14FmLXV748ZBRF1nTWT9zVXnbm lcDZneRAXS6XsRQt2vFxRnWS3q/T9hzADp993gppAExWKj3FqjIqLJfNGZ9ydhCHrACXVLUA8pUJq tTxUYQ6A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eZVti-0002r0-FZ; Thu, 11 Jan 2018 05:59:30 +0000 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eZVtS-0002bG-DN for linux-arm-kernel@lists.infradead.org; Thu, 11 Jan 2018 05:59:16 +0000 Received: by mail-pf0-x244.google.com with SMTP id y89so748068pfk.0 for ; Wed, 10 Jan 2018 21:59:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=0fz0Pu2Lj3v83+8uK4Q05psa2onFPxau3RBiX6J9k40=; b=grUhILmOYZhg8gjT217um7nIIMd8KIbpdj51qyA51XqgKQ6VdSKWNVKb7ZEvRJMMV+ /lQ+72U0Iu0pgSm2Tsnxxxv3Ix6NU+oW2MQ3sB/bRUctC8wJLtQpBUdp7I8yDKKMQh1M tv4UwMRGv/OFoi4HpEtPA6phI51+2/LSDpxYc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=0fz0Pu2Lj3v83+8uK4Q05psa2onFPxau3RBiX6J9k40=; b=Y+bJjAiLaIDvrc1j28rKCmgrsiU5FAPE8VTkQRJGzz+V53XASK197qmleFoN4Zhpfy lsy3ZiuNLQyM4wDZ0Kgf8c364wRRUJwEmAgo8EYLjcUW5Wr9HG8JLvhEHVZykexn+5ID JjnDRPB23wZqffz36WDKLAS+Yh217PgFX2SfEoD8P7aUyVNCht/WoLiXhP7JkenLOfbV 24XbQlqQCSQ8jyETAUkxj0XgfG6WNViql8kURYHxhsbbLu61xVtRq0rbLbcUF9ujQohX EiApofij1rmSBBe0ydE9GbeM/ELkPGgxKISMdRCoWX+F5VUaAljti/dwoDVEXPyvdqGj 7qgg== X-Gm-Message-State: AKwxytfmVxe5Jv+hrE8yBWmKhp3tkXg2O2FsSfX5DFHnxVI8XVK0sEY0 L5wWGRLcZ1qrHnxrfnEJoW1MMg== X-Google-Smtp-Source: ACJfBost2pOTQw8ZJ6auqXPAlB7GCsRnwBuBjKXLjMDF0DjYizpSTR7Ksf+Bh+oT5hfJBj7dTINnbA== X-Received: by 10.84.168.198 with SMTP id f64mr7576397plb.248.1515650343658; Wed, 10 Jan 2018 21:59:03 -0800 (PST) Received: from localhost ([122.166.139.51]) by smtp.gmail.com with ESMTPSA id p1sm32760470pgr.53.2018.01.10.21.59.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Jan 2018 21:59:03 -0800 (PST) From: Viresh Kumar To: arnd@arndb.de, arm@kernel.org Subject: [PATCH 2/3] arm: spear13xx: Fix dmas cells Date: Thu, 11 Jan 2018 11:28:52 +0530 Message-Id: <6183c13fd3abcb2a6834a537a4809b6527204f10.1515650104.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.15.0.194.g9af6a3dea062 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180110_215914_453694_D45B3F84 X-CRM114-Status: GOOD ( 12.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Viresh Kumar , robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The "dmas" cells for the designware DMA controller need to have only 3 properties apart from the phandle: request line, src master and destination master. But the commit 6e8887f60f60 updated it incorrectly while moving from platform code to DT. Fix it. Cc: stable@vger.kernel.org # v3.10+ Fixes: 6e8887f60f60 ("ARM: SPEAr13xx: Pass generic DW DMAC platform data from DT") Reported-by: Arnd Bergmann Signed-off-by: Viresh Kumar --- Documentation/devicetree/bindings/dma/snps-dma.txt | 2 +- arch/arm/boot/dts/spear1340.dtsi | 4 ++-- arch/arm/boot/dts/spear13xx.dtsi | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/snps-dma.txt b/Documentation/devicetree/bindings/dma/snps-dma.txt index a122723907ac..99acc712f83a 100644 --- a/Documentation/devicetree/bindings/dma/snps-dma.txt +++ b/Documentation/devicetree/bindings/dma/snps-dma.txt @@ -64,6 +64,6 @@ described in the dma.txt file, using a four-cell specifier for each channel. reg = <0xe0000000 0x1000>; interrupts = <0 35 0x4>; dmas = <&dmahost 12 0 1>, - <&dmahost 13 0 1 0>; + <&dmahost 13 1 0>; dma-names = "rx", "rx"; }; diff --git a/arch/arm/boot/dts/spear1340.dtsi b/arch/arm/boot/dts/spear1340.dtsi index 5f347054527d..d4dbc4098653 100644 --- a/arch/arm/boot/dts/spear1340.dtsi +++ b/arch/arm/boot/dts/spear1340.dtsi @@ -142,8 +142,8 @@ reg = <0xb4100000 0x1000>; interrupts = <0 105 0x4>; status = "disabled"; - dmas = <&dwdma0 0x600 0 0 1>, /* 0xC << 11 */ - <&dwdma0 0x680 0 1 0>; /* 0xD << 7 */ + dmas = <&dwdma0 12 0 1>, + <&dwdma0 13 1 0>; dma-names = "tx", "rx"; }; diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi index 17ea0abcdbd7..086b4b333249 100644 --- a/arch/arm/boot/dts/spear13xx.dtsi +++ b/arch/arm/boot/dts/spear13xx.dtsi @@ -100,7 +100,7 @@ reg = <0xb2800000 0x1000>; interrupts = <0 29 0x4>; status = "disabled"; - dmas = <&dwdma0 0 0 0 0>; + dmas = <&dwdma0 0 0 0>; dma-names = "data"; }; @@ -290,8 +290,8 @@ #size-cells = <0>; interrupts = <0 31 0x4>; status = "disabled"; - dmas = <&dwdma0 0x2000 0 0 0>, /* 0x4 << 11 */ - <&dwdma0 0x0280 0 0 0>; /* 0x5 << 7 */ + dmas = <&dwdma0 4 0 0>, + <&dwdma0 5 0 0>; dma-names = "tx", "rx"; };