From patchwork Fri Aug 2 14:50:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2837971 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C5A729F479 for ; Fri, 2 Aug 2013 14:52:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 216CA2045E for ; Fri, 2 Aug 2013 14:52:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ECF3D2045B for ; Fri, 2 Aug 2013 14:52:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751247Ab3HBOvg (ORCPT ); Fri, 2 Aug 2013 10:51:36 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:49845 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753662Ab3HBOuv (ORCPT ); Fri, 2 Aug 2013 10:50:51 -0400 Received: from axis700.grange (dslb-178-001-230-204.pools.arcor-ip.net [178.1.230.204]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0Liq3V-1UUYta3reX-00clqb; Fri, 02 Aug 2013 16:50:44 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id B1DAF40BB8; Fri, 2 Aug 2013 16:50:42 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1V5Ggk-0006HJ-Ef; Fri, 02 Aug 2013 16:50:42 +0200 From: Guennadi Liakhovetski To: linux-sh@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Magnus Damm , Simon Horman , Laurent Pinchart , Vinod Koul , Sergei Shtylyov , Guennadi Liakhovetski Subject: [PATCH v5 6/7] ARM: shmobile: r8a73a4: add a DT node and a clock alias for the DMAC Date: Fri, 2 Aug 2013 16:50:41 +0200 Message-Id: <1375455042-24093-7-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1375455042-24093-1-git-send-email-g.liakhovetski@gmx.de> References: <1375455042-24093-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:Df3aRJcnTJR2zWd6OPpqM5N9YcU27QeSftKaE2POwCx 9B6m0x9NSS6ckzErvqnkWSOg54y1+vxWP14YkD16PZrNWE8Lhy wdkjIbiDEtjtYN+vsyZDRDcG9EoEw3tm7XGJaaFuB3otmnKtGL b/VCqc9Qxt0KIgQxYyT6IC2CVv9hR3nXiYZJkz4Bnug0qS9URj a0cLMHxVutOpy+GduAjtAiMUYYaz7pGE3jJXi4BSPphXBjSdR1 cNavXreqhzX8ydD7zOfSluJs6W28GTNGADgHVbLQoRVFquidZN BABpPXqx/gwe+2FJcEcDIB8Af+o6JSANUk/s2Ist34s4bazOBF aVXLukI3OG0duWedmRXPdctowoN9LwO2yDkJ3h+T8E3OZan2e0 tlFu9BUxaQW3g== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 Add a DT node for the only system DMAC instance on r8a73a4. The RT DMAC can be added later under the same multiplexer, because they can serve the same slaves and use the same MID-RID values. Configuration data is supplied to the driver, using a compatibility match string. Signed-off-by: Guennadi Liakhovetski --- arch/arm/boot/dts/r8a73a4.dtsi | 43 ++++++++++++++++++++++++++++++++ arch/arm/mach-shmobile/clock-r8a73a4.c | 1 + 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi index e344b10..3c9c7f2 100644 --- a/arch/arm/boot/dts/r8a73a4.dtsi +++ b/arch/arm/boot/dts/r8a73a4.dtsi @@ -78,6 +78,49 @@ <0 56 4>, <0 57 4>; }; + dmac: dma-multiplexer@0 { + compatible = "renesas,shdma-mux"; + #dma-cells = <1>; + dma-channels = <20>; + dma-requests = <256>; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + dma0: dma-controller@e6700020 { + compatible = "renesas,shdma-r8a73a4"; + reg = <0 0xe6700020 0 0x89e0>; + interrupt-parent = <&gic>; + interrupts = <0 220 4 + 0 200 4 + 0 201 4 + 0 202 4 + 0 203 4 + 0 204 4 + 0 205 4 + 0 206 4 + 0 207 4 + 0 208 4 + 0 209 4 + 0 210 4 + 0 211 4 + 0 212 4 + 0 213 4 + 0 214 4 + 0 215 4 + 0 216 4 + 0 217 4 + 0 218 4 + 0 219 4>; + interrupt-names = "error", + "ch0", "ch1", "ch2", "ch3", + "ch4", "ch5", "ch6", "ch7", + "ch8", "ch9", "ch10", "ch11", + "ch12", "ch13", "ch14", "ch15", + "ch16", "ch17", "ch18", "ch19"; + }; + }; + thermal@e61f0000 { compatible = "renesas,rcar-thermal"; reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>, diff --git a/arch/arm/mach-shmobile/clock-r8a73a4.c b/arch/arm/mach-shmobile/clock-r8a73a4.c index 357b9bc..74841ed 100644 --- a/arch/arm/mach-shmobile/clock-r8a73a4.c +++ b/arch/arm/mach-shmobile/clock-r8a73a4.c @@ -580,6 +580,7 @@ static struct clk_lookup lookups[] = { CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP216]), CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP217]), CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP218]), + CLKDEV_DEV_ID("e6700020.dma-controller", &mstp_clks[MSTP218]), CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]), CLKDEV_DEV_ID("e6520000.i2c", &mstp_clks[MSTP300]), CLKDEV_DEV_ID("sh_mmcif.1", &mstp_clks[MSTP305]),