From patchwork Thu Sep 19 11:29:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jyri Sarha X-Patchwork-Id: 2910911 Return-Path: X-Original-To: patchwork-linux-omap@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 B1BDF9F1E3 for ; Thu, 19 Sep 2013 11:30:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9652920435 for ; Thu, 19 Sep 2013 11:30:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 24DFE20429 for ; Thu, 19 Sep 2013 11:30:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753688Ab3ISLaf (ORCPT ); Thu, 19 Sep 2013 07:30:35 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:54156 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753667Ab3ISLad (ORCPT ); Thu, 19 Sep 2013 07:30:33 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id r8JBUSEn013981; Thu, 19 Sep 2013 06:30:28 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id r8JBUS1w031100; Thu, 19 Sep 2013 06:30:28 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Thu, 19 Sep 2013 06:30:28 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id r8JBUSll016594; Thu, 19 Sep 2013 06:30:28 -0500 Received: from localhost (h64-18.vpn.ti.com [172.24.64.18]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id r8JBUPt01801; Thu, 19 Sep 2013 06:30:26 -0500 (CDT) From: Jyri Sarha To: , CC: , , , , , , , Jyri Sarha , "Hebbar, Gururaja" , Darren Etheridge Subject: [PATCH v3 10/11] ARM/dts: am33xx: mcasp: Add new dma register location to reg-property Date: Thu, 19 Sep 2013 14:29:43 +0300 Message-ID: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, 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 This patch adds an optional address range to reg property. The range describes the register location for DMA controller on am33xx. The both address ranges are named accordingly in the reg-names property. Signed-off-by: Hebbar, Gururaja Signed-off-by: Darren Etheridge Signed-off-by: Jyri Sarha --- arch/arm/boot/dts/am33xx.dtsi | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index fe53ce0..4dc388a 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -556,19 +556,29 @@ mcasp0: mcasp@48038000 { compatible = "ti,omap2-mcasp-audio"; ti,hwmods = "mcasp0"; - reg = <0x48038000 0x2000>; + reg = <0x48038000 0x2000>, + <0x46400000 0x400000>; + reg-names = "mpu", "dma"; interrupts = <80 81>; interrupts-names = "tx", "rx"; status = "disabled"; + dmas = <&edma 8 + &edma 9>; + dma-names = "tx", "rx"; }; mcasp1: mcasp@4803C000 { compatible = "ti,omap2-mcasp-audio"; ti,hwmods = "mcasp1"; - reg = <0x4803C000 0x2000>; + reg = <0x4803C000 0x2000>, + <0x46400000 0x400000>; + reg-names = "mpu", "dma"; interrupts = <82 83>; interrupts-names = "tx", "rx"; status = "disabled"; + dmas = <&edma 10 + &edma 11>; + dma-names = "tx", "rx"; }; };