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: 858807 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="grUhILmO"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zHFZ201csz9ryQ for ; Thu, 11 Jan 2018 16:59:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750957AbeAKF7E (ORCPT ); Thu, 11 Jan 2018 00:59:04 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35011 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750916AbeAKF7E (ORCPT ); Thu, 11 Jan 2018 00:59:04 -0500 Received: by mail-pf0-f196.google.com with SMTP id t12so750674pfg.2 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=UvJr+J3J4kbyN6jfzONFBE4rOPLb7fMDAWQP3dpPZhzP9d3nCIctMuG/NvAJRpO+tG vDguMt+eX8Ozn0OQMA5e9ROBd57KQcyhR43op9R3vCK4HROsD7FduCG6n6JGNtOpbk+x ApaKOxO8ae5zHRQtMl35L4tYWPQKKnWVYu+t8Pi5Mue6qj+MFXbdqx3FWRypM6b9PmCd jmHjPhkYGPkzMcTAOrG2h5vYwyJiEo3YwOScGDg1wJ7DyTlELrDNrertZRA3X9JhJ6wN 1FDjgXUZXk/QzixaJoczM5WmD7WubXuurd4n4a0/A2Uao7M7E7v/8quOlgJv1b22/4RF RqjA== X-Gm-Message-State: AKwxyteWU+17l9I1CF1WWr4EfzCdnEK43mz5TNWflihYzXZB+ur1705L a5u8orGV/4uhcA7WsQuwDnrL1w== 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 Cc: Viresh Kumar , linux-arm-kernel@lists.infradead.org, robh+dt@kernel.org, devicetree@vger.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: Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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"; };