From patchwork Tue Jul 23 10:50:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2831912 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 477FC9F243 for ; Tue, 23 Jul 2013 10:51:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5109820117 for ; Tue, 23 Jul 2013 10:51:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1734520108 for ; Tue, 23 Jul 2013 10:51:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756947Ab3GWKuy (ORCPT ); Tue, 23 Jul 2013 06:50:54 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:50089 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753954Ab3GWKuQ (ORCPT ); Tue, 23 Jul 2013 06:50:16 -0400 Received: from axis700.grange (dslb-094-220-153-077.pools.arcor-ip.net [94.220.153.77]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0M3SWO-1UAqzU3Mxs-00r1ow; Tue, 23 Jul 2013 12:50:13 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 1D27040BCA; Tue, 23 Jul 2013 12:50:11 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1V1aAU-0007EY-Kr; Tue, 23 Jul 2013 12:50:10 +0200 From: Guennadi Liakhovetski To: linux-kernel@vger.kernel.org Cc: Magnus Damm , Simon Horman , Laurent Pinchart , Vinod Koul , linux-sh@vger.kernel.org, Sergei Shtylyov , Guennadi Liakhovetski Subject: [PATCH v4 12/15] ARM: shmobile: r8a7740: add DT nodes and clock aliases for three DMAC instances Date: Tue, 23 Jul 2013 12:50:06 +0200 Message-Id: <1374576609-27748-13-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1374576609-27748-1-git-send-email-g.liakhovetski@gmx.de> References: <1374576609-27748-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:aI7j+7XDImjMzZCwpOONbABST7qisx0MU1T59ojnAoE vdU6+g5F0+hfCpNSkhqD8+sorCZkend74RzhYpDClEYhf36184 ZFBbvdKY8EmhjzfycAWWFpig5W6c1VYBkYziaR8OrAwlMTLWLq fQETxXhjWr4AYyCSa+zZ2swaV7eutzgUrL6kVZ/kb6faYNaBws Sw3wIQnjhRW3yb9ERAhBDdz/5ix36lUfCMhTPYSUah1KYTmlZQ Kg7jzDpeb7IMqwbL4c+F9Q6IddY5bZXnWFLmlx/QiFUCd2Bq9d Jo4rn0UrQepNp6mPC/8DBnz6H4A77et1b94v9Ll/J/12Ltn+nr fvMKh+DBGiuR8GSUw547n8QaLeTGPhwoIUK7P7aBE5V+BS35sD PB5knv3S6J3nwpxn3WJIMi7iHE5zVkLbjE= Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 This patch adds Device Tree support for the three generic DMA controller instances on r8a7740 in a DMA multiplexer node. Signed-off-by: Guennadi Liakhovetski --- arch/arm/boot/dts/r8a7740.dtsi | 61 ++++++++++++++++++++++++++++++++ arch/arm/mach-shmobile/clock-r8a7740.c | 3 ++ 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi index e18a195..4797f1e 100644 --- a/arch/arm/boot/dts/r8a7740.dtsi +++ b/arch/arm/boot/dts/r8a7740.dtsi @@ -116,6 +116,67 @@ 0 149 0x4>; }; + dmac: dma-multiplexer@0 { + compatible = "renesas,shdma-mux"; + #dma-cells = <1>; + dma-channels = <6>; + dma-requests = <256>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + dma0: dma-controller@fe008020 { + compatible = "renesas,shdma-r8a7740"; + 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"; + }; + + dma1: dma-controller@fe018020 { + compatible = "renesas,shdma-r8a7740"; + reg = <0xfe018020 0x270>, + <0xfe019000 0xc>; + interrupt-parent = <&gic>; + interrupts = <0 41 4 + 0 35 4 + 0 36 4 + 0 37 4 + 0 38 4 + 0 39 4 + 0 40 4>; + interrupt-names = "error", + "ch0", "ch1", "ch2", "ch3", + "ch4", "ch5"; + }; + + dma2: dma-controller@fe028020 { + compatible = "renesas,shdma-r8a7740"; + reg = <0xfe028020 0x270>, + <0xfe029000 0xc>; + interrupt-parent = <&gic>; + interrupts = <0 48 4 + 0 42 4 + 0 43 4 + 0 44 4 + 0 45 4 + 0 46 4 + 0 47 4>; + interrupt-names = "error", + "ch0", "ch1", "ch2", "ch3", + "ch4", "ch5"; + }; + }; + i2c0: i2c@fff20000 { #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c index f32a22d..b355018 100644 --- a/arch/arm/mach-shmobile/clock-r8a7740.c +++ b/arch/arm/mach-shmobile/clock-r8a7740.c @@ -576,8 +576,11 @@ static struct clk_lookup lookups[] = { CLKDEV_DEV_ID("e6cb0000.sci", &mstp_clks[MSTP207]), CLKDEV_DEV_ID("sh-dma-engine.3", &mstp_clks[MSTP214]), CLKDEV_DEV_ID("shdma-r8a7740.2", &mstp_clks[MSTP216]), + CLKDEV_DEV_ID("fe028020.dma-controller",&mstp_clks[MSTP216]), CLKDEV_DEV_ID("shdma-r8a7740.1", &mstp_clks[MSTP217]), + CLKDEV_DEV_ID("fe018020.dma-controller",&mstp_clks[MSTP217]), CLKDEV_DEV_ID("shdma-r8a7740.0", &mstp_clks[MSTP218]), + CLKDEV_DEV_ID("fe008020.dma-controller",&mstp_clks[MSTP218]), CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP222]), CLKDEV_DEV_ID("e6cd0000.sci", &mstp_clks[MSTP222]), CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP230]),