From patchwork Fri May 31 09:18:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 17333 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f69.google.com (mail-yh0-f69.google.com [209.85.213.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AF46425CAB for ; Fri, 31 May 2013 09:21:01 +0000 (UTC) Received: by mail-yh0-f69.google.com with SMTP id z20sf1601109yhz.4 for ; Fri, 31 May 2013 02:21:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=LaBc9Kg6cUFxtdqqo7I5WiZ3/o6tKXAYgFBEISxHcOA=; b=lOo8r9VODCNZa2t2irM181hiNEYVeUGdYW9K4SCWu4Gi2LKsDRQFnj6+jJB6wnVhRD pIQBA8GVrXsC+1ulnbcHkmqd1ALbf+50B7t4rAJHKP/vcX3omWiQeGNdJjexJ07UuvNN RjZAMyNMIElEBmac5FVRx8fgY4TGw8BpZPz4jzeKY5jT0Qbnw75dPFm297UZlIlmLqa0 PgOFH44FulJnBXGIm855hCzrhQevnOoJIBxXACfpuSeEw/HaiAiC62FGCMLtqkUqneVW nSpN9aaxz6uFpTmzX7b+glbqBBPUvHfdlrelLUbBxf5PkHoP1Qu8cx5aLya7QwcBBluZ CLbA== X-Received: by 10.224.174.145 with SMTP id t17mr6298233qaz.4.1369992061490; Fri, 31 May 2013 02:21:01 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.24.16 with SMTP id q16ls784560qef.46.gmail; Fri, 31 May 2013 02:21:01 -0700 (PDT) X-Received: by 10.220.3.144 with SMTP id 16mr9316354vcn.6.1369992061165; Fri, 31 May 2013 02:21:01 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id g9si3323167vca.80.2013.05.31.02.21.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 May 2013 02:21:01 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id id13so893756vcb.9 for ; Fri, 31 May 2013 02:21:01 -0700 (PDT) X-Received: by 10.220.10.212 with SMTP id q20mr9468017vcq.9.1369992061088; Fri, 31 May 2013 02:21:01 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.229.199 with SMTP id jj7csp42417vcb; Fri, 31 May 2013 02:21:00 -0700 (PDT) X-Received: by 10.15.51.78 with SMTP id m54mr12915681eew.1.1369992060065; Fri, 31 May 2013 02:21:00 -0700 (PDT) Received: from eu1sys200aog117.obsmtp.com (eu1sys200aog117.obsmtp.com [207.126.144.143]) by mx.google.com with SMTP id 44si29975260eeo.320.2013.05.31.02.20.36 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 31 May 2013 02:21:00 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.143 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.143; Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob117.postini.com ([207.126.147.11]) with SMTP ID DSNKUahrY/BfLQ2LI6lMsozNjfI/peZin+/4@postini.com; Fri, 31 May 2013 09:20:59 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id C5E28284; Fri, 31 May 2013 09:20:20 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 651224A27; Fri, 31 May 2013 09:20:03 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 47E4CA8065; Fri, 31 May 2013 11:20:16 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.279.5; Fri, 31 May 2013 11:20:20 +0200 From: Linus Walleij To: Cc: Arnd Bergmann , Linus Walleij Subject: [PATCH 16/39] ARM: u300: augment device tree with DMA channels Date: Fri, 31 May 2013 11:18:51 +0200 Message-ID: <1369991954-17406-17-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1369991954-17406-1-git-send-email-linus.walleij@stericsson.com> References: <1369991954-17406-1-git-send-email-linus.walleij@stericsson.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmGHthrtyhTBKG3nix+mN2PafjpZVTGoyUAoVMJGWqsGmRH2t33Z85MO9pbE549VBtDhisI X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Linus Walleij This adds DMA channel assignments to the MMC/SD-controller and the two UARTs already in the U300 device tree, as we have now defined a way to obtain DMA channels from the device tree. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-u300.dts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts index ae51dd1..6be932b 100644 --- a/arch/arm/boot/dts/ste-u300.dts +++ b/arch/arm/boot/dts/ste-u300.dts @@ -185,6 +185,8 @@ reg = <0xc0013000 0x1000>; interrupt-parent = <&vica>; interrupts = <22>; + dmas = <&dmac 17 &dmac 18>; + dma-names = "tx", "rx"; }; uart1: serial@c0007000 { @@ -192,6 +194,8 @@ reg = <0xc0007000 0x1000>; interrupt-parent = <&vicb>; interrupts = <20>; + dmas = <&dmac 38 &dmac 39>; + dma-names = "tx", "rx"; }; mmcsd: mmcsd@c0001000 { @@ -206,6 +210,8 @@ cd-gpios = <&gpio 12 0x4>; cd-inverted; vmmc-supply = <&ab3100_ldo_g_reg>; + dmas = <&dmac 14>; + dma-names = "rx"; }; }; };