From patchwork Mon Apr 4 01:22:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 8735951 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2779F9F38C for ; Mon, 4 Apr 2016 01:23:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8D056201CD for ; Mon, 4 Apr 2016 01:23:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CE121201F5 for ; Mon, 4 Apr 2016 01:23:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753732AbcDDBXc (ORCPT ); Sun, 3 Apr 2016 21:23:32 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:53640 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752817AbcDDBXc (ORCPT ); Sun, 3 Apr 2016 21:23:32 -0400 Received: from reginn.isobedori.kobe.vergenet.net (p8241-ipbfp1002kobeminato.hyogo.ocn.ne.jp [118.10.140.241]) by kirsty.vergenet.net (Postfix) with ESMTPA id 141EA25BEB5; Mon, 4 Apr 2016 11:23:20 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1459733000; bh=0KKRQdLWp57JSOUEgZaftkbVy9Zxr3qB9OAWn/hTpvE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jLju6d8y6UFWRgSX0d5PL6A50//3GE+xXCoql3gjg9t9NnyhmeNfM7Rl2Rro5NeE8 +pWc0dAhIy1iA0MPdAYLBw7O/HSViQXAMDboxWRMqN+0OR6CWyd5JJio43B85kxjJ1 AA0uoRv9y58fzKAdjmYzx8EERSSqh3jHWdiL8VtM= Received: by reginn.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id D14CF941179; Mon, 4 Apr 2016 10:23:20 +0900 (JST) From: Simon Horman To: linux-renesas-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Magnus Damm , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Simon Horman Subject: [PATCH 09/47] ARM: dts: r8a7790: Reference both DMA controllers in HSCIF nodes Date: Mon, 4 Apr 2016 10:22:41 +0900 Message-Id: <351b747ccc29a169ce8214580900f25148555257.1459732726.git.horms+renesas@verge.net.au> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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: Niklas Söderlund R-Car Gen2 have two DMA controllers, which are equivalent. Add references to both dmac0 and dmac1 so the driver can fallback to the later if the first one is unavailable. Signed-off-by: Niklas Söderlund Acked-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/boot/dts/r8a7790.dtsi | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index 13e8817e9cfe..2c0249395261 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@ -760,8 +760,9 @@ clocks = <&mstp7_clks R8A7790_CLK_HSCIF0>, <&zs_clk>, <&scif_clk>; clock-names = "fck", "brg_int", "scif_clk"; - dmas = <&dmac0 0x39>, <&dmac0 0x3a>; - dma-names = "tx", "rx"; + dmas = <&dmac0 0x39>, <&dmac0 0x3a>, + <&dmac1 0x39>, <&dmac1 0x3a>; + dma-names = "tx", "rx", "tx", "rx"; power-domains = <&cpg_clocks>; status = "disabled"; }; @@ -774,8 +775,9 @@ clocks = <&mstp7_clks R8A7790_CLK_HSCIF1>, <&zs_clk>, <&scif_clk>; clock-names = "fck", "brg_int", "scif_clk"; - dmas = <&dmac0 0x4d>, <&dmac0 0x4e>; - dma-names = "tx", "rx"; + dmas = <&dmac0 0x4d>, <&dmac0 0x4e>, + <&dmac1 0x4d>, <&dmac1 0x4e>; + dma-names = "tx", "rx", "tx", "rx"; power-domains = <&cpg_clocks>; status = "disabled"; };