From patchwork Fri May 31 09:18:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 17331 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-fa0-f72.google.com (mail-fa0-f72.google.com [209.85.161.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 751B825CAB for ; Fri, 31 May 2013 09:20:57 +0000 (UTC) Received: by mail-fa0-f72.google.com with SMTP id v1sf1299311fav.3 for ; Fri, 31 May 2013 02:20:56 -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=hsvHZDfaz9LSR+jFPuE4xcugJ1XoVUFut35CEJbk/iw=; b=LDBPnFPXc9sQoqJDFGVRN3DDB0oOwJR7lwQClX9Q3rqsJoEkoGwHUqI/vdp79nXsv2 jgI+pbC33WnnqyAqNrf0Xn5siaGyhMA1HiK2PdMrQOvm4eVhW0KbhpicjsG+tPRJGGuu 1/uV7QL/xrPZLBAb43AEwYvdJPLV0TKrtGiAd08+lY6hRwYe43yNLM6YEij9di1BwXLG +4McBR4NsGZ21e0/VCwfE13jJ932ontZeVMk3pj/BZK966Ypz6kH9jrtdpgbV3ISGXxS fvnSqM0OP04lJ3oMdLJSAxJe1p8rM+BVeXNBV6LnR4mn3BjfKkLjjEFzOPpAefGYgyne QpdQ== X-Received: by 10.180.11.232 with SMTP id t8mr1135881wib.3.1369992056558; Fri, 31 May 2013 02:20:56 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.39.197 with SMTP id r5ls176915wik.5.gmail; Fri, 31 May 2013 02:20:56 -0700 (PDT) X-Received: by 10.180.185.225 with SMTP id ff1mr2331355wic.36.1369992056360; Fri, 31 May 2013 02:20:56 -0700 (PDT) Received: from mail-ve0-x22e.google.com (mail-ve0-x22e.google.com [2607:f8b0:400c:c01::22e]) by mx.google.com with ESMTPS id hx3si6560707wjb.141.2013.05.31.02.20.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 May 2013 02:20:56 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::22e 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::22e; Received: by mail-ve0-f174.google.com with SMTP id oz10so935024veb.19 for ; Fri, 31 May 2013 02:20:55 -0700 (PDT) X-Received: by 10.52.233.34 with SMTP id tt2mr7815883vdc.70.1369992055306; Fri, 31 May 2013 02:20:55 -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 jj7csp42412vcb; Fri, 31 May 2013 02:20:54 -0700 (PDT) X-Received: by 10.15.35.129 with SMTP id g1mr12901790eev.110.1369992053444; Fri, 31 May 2013 02:20:53 -0700 (PDT) Received: from eu1sys200aog107.obsmtp.com (eu1sys200aog107.obsmtp.com [207.126.144.123]) by mx.google.com with SMTP id f5si30047458eep.128.2013.05.31.02.20.29 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 31 May 2013 02:20:53 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.123 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.123; Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob107.postini.com ([207.126.147.11]) with SMTP ID DSNKUahrWi6/u2TVkUtOSpyK22xDOc7wGwsC@postini.com; Fri, 31 May 2013 09:20:53 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 79FFD108; Fri, 31 May 2013 09:20:23 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 313D816B1; Fri, 31 May 2013 09:20:23 +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 5814FA8065; Fri, 31 May 2013 11:20:18 +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:22 +0200 From: Linus Walleij To: Cc: Arnd Bergmann , Linus Walleij Subject: [PATCH 17/39] ARM: u300: add the COH 901 318 DMAC to device tree Date: Fri, 31 May 2013 11:18:52 +0200 Message-ID: <1369991954-17406-18-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: ALoCoQncB5Zn4LuNz6eL98Bg0M9ECWBcBBe2ZDqyMHinJBfVwTYo29r5T+XLbEtUlWs2IaPWD5vO X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::22e 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 the COH 901 318 DMA controller to the U300 device tree. All devices now converted to device tree so far will start to find their DMA channels. Note that the U300 is not yet using the device tree to obtain DMA channels, but this is a first step. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-u300.dts | 9 +++++++++ arch/arm/mach-u300/core.c | 2 ++ 2 files changed, 11 insertions(+) diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts index 6be932b..4dc9f26 100644 --- a/arch/arm/boot/dts/ste-u300.dts +++ b/arch/arm/boot/dts/ste-u300.dts @@ -68,6 +68,15 @@ interrupts = <10>; }; + dmac: dma-controller@c00020000 { + compatible = "stericsson,coh901318"; + reg = <0xc0020000 0x1000>; + interrupt-parent = <&vica>; + interrupts = <2>; + #dma-cells = <1>; + dma-channels = <40>; + }; + i2c0: i2c@c0004000 { compatible = "st,ddci2c"; reg = <0xc0004000 0x1000>; diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 637034b..7866f54 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -714,6 +714,8 @@ static struct of_dev_auxdata u300_auxdata_lookup[] __initdata = { "coh901327_wdog", NULL), OF_DEV_AUXDATA("stericsson,coh901331", U300_RTC_BASE, "rtc-coh901331", NULL), + OF_DEV_AUXDATA("stericsson,coh901318", U300_DMAC_BASE, + "coh901318", NULL), OF_DEV_AUXDATA("arm,primecell", U300_UART0_BASE, "uart0", &uart0_plat_data), OF_DEV_AUXDATA("arm,primecell", U300_UART1_BASE,