From patchwork Mon Apr 14 21:35:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 3986581 X-Patchwork-Delegate: vinod.koul@intel.com Return-Path: X-Original-To: patchwork-dmaengine@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 7E8A49F2CC for ; Mon, 14 Apr 2014 21:35:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AFB1A2016C for ; Mon, 14 Apr 2014 21:35:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB0B420179 for ; Mon, 14 Apr 2014 21:35:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755418AbaDNVfh (ORCPT ); Mon, 14 Apr 2014 17:35:37 -0400 Received: from ducie-dc1.codethink.co.uk ([185.25.241.215]:53818 "EHLO ducie-dc1.codethink.co.uk" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1755383AbaDNVff (ORCPT ); Mon, 14 Apr 2014 17:35:35 -0400 Received: from localhost (localhost [127.0.0.1]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTP id B60784678EA; Mon, 14 Apr 2014 22:35:34 +0100 (BST) X-Virus-Scanned: Debian amavisd-new at ducie-dc1.codethink.co.uk Received: from ducie-dc1.codethink.co.uk ([127.0.0.1]) by localhost (ducie-dc1.codethink.co.uk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id s2b9EAGZl1mU; Mon, 14 Apr 2014 22:35:29 +0100 (BST) Received: from rainbowdash.ducie.codethink.co.uk (rainbowdash.dyn.ducie.codethink.co.uk [10.24.1.133]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTPS id EAC31462AC6; Mon, 14 Apr 2014 22:35:14 +0100 (BST) Received: from ben by rainbowdash.ducie.codethink.co.uk with local (Exim 4.82) (envelope-from ) id 1WZoX4-0001Hc-MU; Mon, 14 Apr 2014 22:35:14 +0100 From: Ben Dooks To: linux-kernel@lists.codethink.co.uk, dmaengine@vger.kernel.org Cc: vinod.koul@intel.com, dan.j.williams@intel.com, linux-sh@vger.kernel.org, magnus.damm@opensource.se, horms@verge.net.au, g.liakhovetski@gmx.d, kuninori.morimoto.gx@renesas.com, devicetree@vger.kernel.org, Ben Dooks Subject: [PATCH v2 6/9] ARM: shmobile: r8a7790: add audio dmac node Date: Mon, 14 Apr 2014 22:35:09 +0100 Message-Id: <1397511312-4845-7-git-send-email-ben.dooks@codethink.co.uk> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1397511312-4845-1-git-send-email-ben.dooks@codethink.co.uk> References: <1397511312-4845-1-git-send-email-ben.dooks@codethink.co.uk> Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, 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 Add initial audio dmac node and resources. Signed-off-by: Ben Dooks --- arch/arm/boot/dts/r8a7790.dtsi | 66 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index de3ca15..582e687 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@ -158,6 +158,72 @@ }; }; + dma1: dma-mux@1 { + compatible = "renesas,shdma-mux"; + #dma-cells = <2>; + dma-channels = <20>; + dma-requests = <256>; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + audiodma0: dma-contorller@ec700000 { + compatible = "renesas,shdma-r8a7790"; + clocks = <&mstp5_clks R8A7790_CLK_AUDIO_DMAC0>; + dma-channels = <13>; + status = "disabled"; + reg = <0 0xec700020 0 0xffc0>; + + interrupts = <0 346 IRQ_TYPE_LEVEL_HIGH>, /* error */ + <0 320 IRQ_TYPE_LEVEL_HIGH>, /* ch0 */ + <0 321 IRQ_TYPE_LEVEL_HIGH>, + <0 322 IRQ_TYPE_LEVEL_HIGH>, + <0 323 IRQ_TYPE_LEVEL_HIGH>, + <0 324 IRQ_TYPE_LEVEL_HIGH>, + <0 325 IRQ_TYPE_LEVEL_HIGH>, + <0 326 IRQ_TYPE_LEVEL_HIGH>, + <0 327 IRQ_TYPE_LEVEL_HIGH>, + <0 328 IRQ_TYPE_LEVEL_HIGH>, + <0 329 IRQ_TYPE_LEVEL_HIGH>, + <0 330 IRQ_TYPE_LEVEL_HIGH>, + <0 331 IRQ_TYPE_LEVEL_HIGH>, + <0 332 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "error", + "ch0", "ch1", "ch2", "ch3", + "ch4", "ch5", "ch6", "ch7", + "ch8", "ch9", "ch10", "ch11", + "ch12"; + }; + + audiodma1: dma-controller@ec720000 { + compatible = "renesas,shdma-r8a7790"; + clocks = <&mstp5_clks R8A7790_CLK_AUDIO_DMAC1>; + dma-channels = <13>; + status = "disabled"; + reg = <0 0xec720020 0 0xffc0>; + + interrupts = <0 347 IRQ_TYPE_LEVEL_HIGH>, /* error */ + <0 333 IRQ_TYPE_LEVEL_HIGH>, /* ch0 */ + <0 334 IRQ_TYPE_LEVEL_HIGH>, + <0 335 IRQ_TYPE_LEVEL_HIGH>, + <0 336 IRQ_TYPE_LEVEL_HIGH>, + <0 337 IRQ_TYPE_LEVEL_HIGH>, + <0 338 IRQ_TYPE_LEVEL_HIGH>, + <0 339 IRQ_TYPE_LEVEL_HIGH>, + <0 340 IRQ_TYPE_LEVEL_HIGH>, + <0 341 IRQ_TYPE_LEVEL_HIGH>, + <0 342 IRQ_TYPE_LEVEL_HIGH>, + <0 343 IRQ_TYPE_LEVEL_HIGH>, + <0 344 IRQ_TYPE_LEVEL_HIGH>, + <0 345 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "error", + "ch0", "ch1", "ch2", "ch3", + "ch4", "ch5", "ch6", "ch7", + "ch8", "ch9", "ch10", "ch11", + "ch12"; + }; + }; + gic: interrupt-controller@f1001000 { compatible = "arm,cortex-a15-gic"; #interrupt-cells = <3>;