Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752099Ab3GSUXr (ORCPT ); Fri, 19 Jul 2013 16:23:47 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:59536 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751473Ab3GSUXG (ORCPT ); Fri, 19 Jul 2013 16:23:06 -0400 From: Guennadi Liakhovetski To: linux-kernel@vger.kernel.org Cc: Simon Horman , Magnus Damm , linux-sh@vger.kernel.org, Vinod Koul , Laurent Pinchart , Sergei Shtylyov , Guennadi Liakhovetski Subject: [PATCH v2 12/15] ARM: shmobile: r8a7740: add DT nodes and clock aliases for three DMAC instances Date: Fri, 19 Jul 2013 22:22:53 +0200 Message-Id: <1374265376-30777-3-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1374251374-30186-1-git-send-email-g.liakhovetski@gmx.de> References: <1374251374-30186-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:FtlRrUIrhmMsFMc8xH8P/zDoSIE5so60W5vspntI+X7 fJoIMjlCHO+dnFQu3VduTQA7Hcl2nX6+Vxb/3yyg/WJiMHiiOx TnH6USvNCqeufW0NgphuuAvHBzgQ2JynZgr9IfLDTyqYIIbkdW N2ibf91numT8IUUtK2/1XV+Q4ADg2xzweKW0YLj2bX2xFdRl0S 7JfALtJfKewrc9DUNyP/eg2wgBmPhU3LqIxp7+Wdz7SCDJNCTP fvDaO/2FuxF1XwGaHr062XQSmd+8wbnvTFrGgBm9WBRJuA/uyO +vqFOVLKMQ+UW1mS4A4Wp/R7ogkhT2kch+iLCQK9m68WGPN2mC xtKDlzaxMDM6in9lqT+swFap4zBwTWryDFxMPmAfqHH56i4LZk vrL/wYYZ4tqIg== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3175 Lines: 108 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 --- v2: Use "dma-controller" for DMA controller DT nodes 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 62b86f9..4e76fb8 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]), -- 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/