From patchwork Fri Apr 26 16:27:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2494271 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D35323FC64 for ; Fri, 26 Apr 2013 16:27:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755199Ab3DZQ1v (ORCPT ); Fri, 26 Apr 2013 12:27:51 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:65350 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754067Ab3DZQ1u (ORCPT ); Fri, 26 Apr 2013 12:27:50 -0400 Received: from axis700.grange (dslb-088-076-028-093.pools.arcor-ip.net [88.76.28.93]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0Mg2HB-1UBENV3lVl-00NAek; Fri, 26 Apr 2013 18:27:49 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id EEBB440BC3; Fri, 26 Apr 2013 18:27:47 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1UVlUx-00064W-Kq; Fri, 26 Apr 2013 18:27:47 +0200 From: Guennadi Liakhovetski To: linux-sh@vger.kernel.org Cc: Magnus Damm , Simon Horman , linux-arm-kernel@lists.infradead.org, Guennadi Liakhovetski Subject: [PATCH 5/6] ARM: shmobile: r8a7740: add DT node for one DMAC instance Date: Fri, 26 Apr 2013 18:27:46 +0200 Message-Id: <1366993667-23294-6-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1366993667-23294-1-git-send-email-g.liakhovetski@gmx.de> References: <1366993667-23294-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:c+1nGTyjQHGsmqiTtyRE+yNROHGFJ1LdZHq/3ph6dmY lgjS4j53+lmlcAY3tiEmVsoZDBixJBC4ZigddeP99udv2rxDbf /CeKanjU48cy2i9iXBXqRG7aPPPV46t6+iZ6yv7gIh7t20Xzk5 4N1Y+BaVst8eYYBg4KYniel8q9yrd56ibTcMCEJYcm+WSMawVG Wz2Tn3Frhfsg17C+IGeCAn6RYeWqe6tqctQD7C1trHsaVW3/8T SdTA5XDbX6yqe3d/hw/ot2ICiomIYks9ytwe6u4MimB5d1kqQW UqvakIaSpxmxq2hjh7vig6/zFN1fDmZJ2y6+aAYufVymBWaVHw cGe7mdesfM274hIswIrsQ2sNvwDAvoC1Jx7J9x4i4kDJUDc9t7 Sxf4DOihrl9gQ== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org This patch adds Device Tree support for the first (#0) DMA controller instance on r8a7740. We want to add further DMA controller DT nodes in a DMA multiplexer node, which isn't implemented yet. Further DMAC instances will be added after the DMA multiplexer support is done. Signed-off-by: Guennadi Liakhovetski --- arch/arm/boot/dts/r8a7740.dtsi | 20 ++++++++++++++++++++ arch/arm/mach-shmobile/setup-r8a7740.c | 2 ++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi index e9a90d8..054bc1a 100644 --- a/arch/arm/boot/dts/r8a7740.dtsi +++ b/arch/arm/boot/dts/r8a7740.dtsi @@ -112,6 +112,26 @@ 0 149 0x4>; }; + dma0: shdma@fe008020 { + compatible = "renesas,shdma"; + reg = <0xfe008020 0x270 + 0xfe009000 0xc>; + interrupt-parent = <&gic>; + interrupts = <0 34 4 + 0 28 4 + 0 29 4 + 0 30 4 + 0 31 4 + 0 32 4 + 0 33 4>; + interrupt-names = "error", + "ch0", "ch1", "ch2", "ch3", + "ch4", "ch5"; + #dma-cells = <1>; + dma-channels = <6>; + dma-requests = <256>; + }; + i2c0: i2c@fff20000 { #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c index 6b3ed42..7781d3b 100644 --- a/arch/arm/mach-shmobile/setup-r8a7740.c +++ b/arch/arm/mach-shmobile/setup-r8a7740.c @@ -997,6 +997,8 @@ void __init r8a7740_add_early_devices(void) #ifdef CONFIG_USE_OF static const struct of_dev_auxdata r8a7740_auxdata_lookup[] __initconst = { + OF_DEV_AUXDATA("renesas,shdma", 0xfe008020, "sh-dma-engine.0", + &r8a7740_dma_platform_data), { } };