From patchwork Thu May 2 09:06:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 16573 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-bk0-f72.google.com (mail-bk0-f72.google.com [209.85.214.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9ABE0238EC for ; Thu, 2 May 2013 09:07:41 +0000 (UTC) Received: by mail-bk0-f72.google.com with SMTP id jc3sf513049bkc.3 for ; Thu, 02 May 2013 02:07:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :from:to:cc:subject:date:message-id:x-mailer: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=LZ9YJOValKUMh1s8KtxirWEClw6MmmNFVHO+7gYQM74Ykb+9MzJBHjE+2sKKBr9F+V fnjDTmVGqyn+XdmOOzBfet0yZJLPrq9SAQDvtSG1APjTthIOzzot3u5imZ874HKZIP8C 1+s/MdIXKw9XMRgBNBQ+6qfV4ghYEETGGRoSPYPvb6ZB0eRd8Rt9I22h7ptP7PyruSp/ pM03x19HABd+GbT2M2p84wGlAdhzHPV6yho/ajIvlf1md6BVISroxSpq1g5NqSFf2rEs acsQ0Xm/d8/PPcPhgwXDNxbhk7FL/HJUqNP1thwHTrE995Ytou65QxjPx7+3dMQS6ab9 uz4Q== X-Received: by 10.180.189.44 with SMTP id gf12mr18722970wic.1.1367485653501; Thu, 02 May 2013 02:07:33 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.109.65 with SMTP id hq1ls751597wib.42.gmail; Thu, 02 May 2013 02:07:33 -0700 (PDT) X-Received: by 10.194.248.200 with SMTP id yo8mr6536875wjc.36.1367485653426; Thu, 02 May 2013 02:07:33 -0700 (PDT) Received: from mail-ve0-x230.google.com (mail-ve0-x230.google.com [2607:f8b0:400c:c01::230]) by mx.google.com with ESMTPS id va9si1696911wjc.191.2013.05.02.02.07.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 02 May 2013 02:07:33 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::230 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::230; Received: by mail-ve0-f176.google.com with SMTP id b10so286056vea.21 for ; Thu, 02 May 2013 02:07:32 -0700 (PDT) X-Received: by 10.220.189.9 with SMTP id dc9mr1886552vcb.8.1367485652173; Thu, 02 May 2013 02:07:32 -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.58.127.98 with SMTP id nf2csp191782veb; Thu, 2 May 2013 02:07:31 -0700 (PDT) X-Received: by 10.14.109.131 with SMTP id s3mr17330892eeg.26.1367485651160; Thu, 02 May 2013 02:07:31 -0700 (PDT) Received: from eu1sys200aog120.obsmtp.com (eu1sys200aog120.obsmtp.com [207.126.144.149]) by mx.google.com with SMTP id i41si6885663eev.92.2013.05.02.02.07.00 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 02 May 2013 02:07:31 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.149 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.149; Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob120.postini.com ([207.126.147.11]) with SMTP ID DSNKUYIsrwn/P4s+j6da8Or2cr6Gh115HPvF@postini.com; Thu, 02 May 2013 09:07:31 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 B9A361A4; Thu, 2 May 2013 09:06:54 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 6F32947EB; Thu, 2 May 2013 09:06:46 +0000 (GMT) Received: from exdcvycastm004.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm004", Issuer "exdcvycastm004" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 0A47024C2FA; Thu, 2 May 2013 11:06:49 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.2) with Microsoft SMTP Server (TLS) id 8.3.279.5; Thu, 2 May 2013 11:07:02 +0200 From: Linus Walleij To: , Vinod Koul , Arnd Bergmann Cc: Dan Williams , , Linus Walleij Subject: [PATCH] ARM: u300: augment device tree with DMA channels Date: Thu, 2 May 2013 11:06:49 +0200 Message-ID: <1367485609-6154-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmgi3PoT22K8OsfoOzYDrccwmXPPMWakpfZBP5e/SQFSa50mhx3FvcyrYaWIQuTPpFQXeUa X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::230 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"; }; }; };