From patchwork Mon Apr 4 01:23:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 8737011 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 641F5C0553 for ; Mon, 4 Apr 2016 02:01:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5F64420123 for ; Mon, 4 Apr 2016 02:01:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5D5BC20204 for ; Mon, 4 Apr 2016 02:01:55 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1amtoP-0006cl-G2; Mon, 04 Apr 2016 02:00:17 +0000 Received: from kirsty.vergenet.net ([202.4.237.240]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1amtKu-0002AU-6T for linux-arm-kernel@lists.infradead.org; Mon, 04 Apr 2016 01:29:54 +0000 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 4791B25BED4; Mon, 4 Apr 2016 11:23:21 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1459733001; bh=FMl6WXquE1oANKOVujyzPwacKjUrKppme8aXwl3DwyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k9ZL8SCdAjGxbiPZG6Yp93sh+zJcDm8FadQI+dNWPk/G2YbHoWm6rmzpgfEzNWh0y GRAcB6WiInVoi8V7fTOI6UoSpZQbOoYvwhbGCr7NgBuyzY7wmDEiQa1OQ1ekg3992Z orFMRdMMScbCx/Ft154rfkDaiuCLKz1RmKCUmk00= Received: by reginn.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id EEACD94325E; Mon, 4 Apr 2016 10:23:22 +0900 (JST) From: Simon Horman To: linux-renesas-soc@vger.kernel.org Subject: [PATCH 37/47] ARM: dts: r8a7794: Reference both DMA controllers in MMCIF node Date: Mon, 4 Apr 2016 10:23:09 +0900 Message-Id: <14200212ddfd1e2b66ea17050cb0c1950f147545.1459732726.git.horms+renesas@verge.net.au> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160403_182949_177472_0417DD0C X-CRM114-Status: UNSURE ( 9.64 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -5.3 (-----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Simon Horman , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Magnus Damm , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,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/r8a7794.dtsi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi index ec54246879b4..1219f7509433 100644 --- a/arch/arm/boot/dts/r8a7794.dtsi +++ b/arch/arm/boot/dts/r8a7794.dtsi @@ -652,8 +652,9 @@ reg = <0 0xee200000 0 0x80>; interrupts = ; clocks = <&mstp3_clks R8A7794_CLK_MMCIF0>; - dmas = <&dmac0 0xd1>, <&dmac0 0xd2>; - dma-names = "tx", "rx"; + dmas = <&dmac0 0xd1>, <&dmac0 0xd2>, + <&dmac1 0xd1>, <&dmac1 0xd2>; + dma-names = "tx", "rx", "tx", "rx"; power-domains = <&cpg_clocks>; reg-io-width = <4>; status = "disabled";