From patchwork Thu Mar 1 15:26:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130262 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2949757edc; Thu, 1 Mar 2018 07:36:20 -0800 (PST) X-Google-Smtp-Source: AG47ELvjzQGu+xKrxkw1JwMU1AGV15oGMkHnpjObu5SnvoZL+lo5YrimXJHYc3Xa+RwsxxMGqbVB X-Received: by 2002:a17:902:2b84:: with SMTP id l4-v6mr2311049plb.338.1519918579957; Thu, 01 Mar 2018 07:36:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918579; cv=none; d=google.com; s=arc-20160816; b=ddlOjlq0oFKQgJb4ElbaDWH8TDfcoXotpo99Ys3bguwAOn1JYR7urO85C2EpuTj+WR H44igadOjywSrVzRYUoff0ktEgRjG6QnClvSmFgSoTVSoz/t2EdeiD6dH3HmaQnbR7cQ MCdbVAgCEPipMsic4LCL02XxkcSuSb757RS1iUQb0u3YPPaOsEjr7zFh+IY1HSm36InD HQALJoNQ4EPUZCPbeOZ1wurYj6ZIULWjDk7OPwXOaReSgyqAl42wJ1FW2AmYeTDetX+P KYB4KPQrTMpWTv5Uoodp79TplXxuyzm8y0q07XXEy6K+5GId/NOZakxN6bp877dIcRY9 DrhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=yD4gnTvuVPVb4KBj7ETWSB6bA+mJLffffN1kLrUtvic=; b=G5UnLSvnH9Z3Lxoly0uqpgZn2zTqtmCOLAMlkJJILxOtKfAsTdx9LXlqulbfhh0lH/ M1LqD7juRiQ/oro2bwgzDffjOXSrCjo08wOZ/qw771siHuZVysXHaVF8tMVcepDnbW9n RUE/V36MzzXVl3zFPzb7C1E4nSEf8O1I2PMGv2RGaOry3bg//1o02OaC1Y6OnR9HTcc4 oC3nTcv2/zIx+xghKPKKPgHZwCAGuC+jRKI9QWKapXxc0TDYpqAGWL336f7xGsvk4+9D OmAYthax7l0mBen86xlrmAD3j/ALj86dm/mp1h1tkLnvCqD6ZjnV92s0FNvOwpf0fBA1 haYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=RqVQ8Hwa; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g4si3157102pfh.98.2018.03.01.07.36.19; Thu, 01 Mar 2018 07:36:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=RqVQ8Hwa; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032403AbeCAPgR (ORCPT + 10 others); Thu, 1 Mar 2018 10:36:17 -0500 Received: from mail-sn1nam01on0094.outbound.protection.outlook.com ([104.47.32.94]:38448 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032394AbeCAPfh (ORCPT ); Thu, 1 Mar 2018 10:35:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=yD4gnTvuVPVb4KBj7ETWSB6bA+mJLffffN1kLrUtvic=; b=RqVQ8HwaC6hXshLLkSDbtf+3K+3xTz8u/tNk0kYOKoX1tq3ZqGn8G/sNWEa9fjPvKV7+/zykOHCcEmagdMwwfztNykw3/yv8S4K1OfMDfpkuJEauOIHwut6ORa3Kw8Elm+WJYgrLk/du7o34ZvefbFU6uOgLxYhzr9YaQdSW2BY= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0888.namprd21.prod.outlook.com (52.132.132.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.2; Thu, 1 Mar 2018 15:35:35 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0567.006; Thu, 1 Mar 2018 15:35:35 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Viresh Kumar , Olof Johansson , Sasha Levin Subject: [added to the 4.1 stable tree] arm: spear13xx: Fix dmas cells Thread-Topic: [added to the 4.1 stable tree] arm: spear13xx: Fix dmas cells Thread-Index: AQHTsXGpk5UUExWqBkaLp+WA9/y2wQ== Date: Thu, 1 Mar 2018 15:26:24 +0000 Message-ID: <20180301152116.1486-362-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0888; 7:M5HdQ2G6v6GnGP+vMNVrgPF1COJwR6W2yhwuyiB0T4VUcvD6LjqNhrAG19HZAZnjkKSrZryD5uNv/64mHbG3RzX93hgSD/dUo04txPttW4r9BwnDeR248AY1KyhfTBO+bXhozORj7sW/tZfILD6BvGfiVb77kT2U6ryApvm+caomFaXZ9mN4V7tLdYxbLY6p1cRhtM1s8IKl5fn/JohKYh9d5UOBGoRekq+J16XFQBR+ogUI1bu/iNpi29fNhRIi x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: fd7706d3-cc4c-496d-ea17-08d57f8a1379 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB0888; x-ms-traffictypediagnostic: DM5PR2101MB0888: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(9452136761055); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(3231220)(944501225)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR2101MB0888; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0888; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(396003)(39380400002)(346002)(39860400002)(376002)(189003)(199004)(186003)(2906002)(6436002)(26005)(10290500003)(6666003)(6346003)(2950100002)(2900100001)(6116002)(106356001)(53936002)(3846002)(3660700001)(3280700002)(36756003)(6512007)(107886003)(316002)(102836004)(10090500001)(66066001)(59450400001)(25786009)(6506007)(14454004)(305945005)(8936002)(86362001)(5250100002)(81156014)(81166006)(2501003)(8676002)(86612001)(22452003)(7736002)(478600001)(1076002)(4326008)(105586002)(97736004)(99286004)(76176011)(110136005)(6486002)(68736007)(54906003)(72206003)(5660300001)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0888; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: +dfggTAndizfQXKXKDhiB5RvZZ4/k/i7t50D6iTzwwfo6YtQWKu6bDLz5gmZYTxKsgy1AEdn6kx1MTf+UJMYi89hWf3uj9W3cb1oPncufRvV5nkaJCmkQuv2ly2JDOxK49R1G0bLzHGCjz/4iiqvtyL2OY4Tajz+J042n3kYx68= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd7706d3-cc4c-496d-ea17-08d57f8a1379 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:26:24.9922 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0888 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Viresh Kumar This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. -- 2.14.1 =============== [ Upstream commit cdd10409914184c7eee5ae3e11beb890c9c16c61 ] 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 Signed-off-by: Olof Johansson Signed-off-by: Sasha Levin --- 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 c261598164a7..17d43ca27f41 100644 --- a/Documentation/devicetree/bindings/dma/snps-dma.txt +++ b/Documentation/devicetree/bindings/dma/snps-dma.txt @@ -58,6 +58,6 @@ Example: interrupts = <0 35 0x4>; status = "disabled"; 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 13e1aa33daa2..69bc407b4a5a 100644 --- a/arch/arm/boot/dts/spear1340.dtsi +++ b/arch/arm/boot/dts/spear1340.dtsi @@ -141,8 +141,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 40accc87e3a2..4e5a2770eac8 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"; }; @@ -288,8 +288,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"; };