From patchwork Mon Apr 22 09:59:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 16307 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E922325DEE for ; Mon, 22 Apr 2013 10:00:44 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id 15sf1184130vea.4 for ; Mon, 22 Apr 2013 02:59:58 -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=5oFCkwn8cSz1XweFYX+LACjIHddU7KDaPZwVO8WIJbk=; b=hElbfGCQo2aiSbspuT9m3JjP3HQFfD4/e4GvaoOcTQKqrPeVqei0LjpMdLpKSoDl0l iwjlIEzf+jPwGlEvTscDNbwcJ3memebLLUtm+vET9lBQB7irCEqUPZjg0jtFnJFgAWcy JYUdMcfeSsP4SbSIerE8jHQLq2xc04TjQWou6Kqa99kyacjon+zHXdxupPxElBwbKUr0 HOoDDvzJs9vRCgcun5OkCzgCWlbwxsjhqJ/86ICc+pRiG8rKX/VDGmzcR+sD6EpEc3ON pwOsBoVOW3QYrRnvw/vsFQFDbV/ggY4ZphjCe/Rhjar4/VeZGTDNVfSEdOKMfCbWpn05 wYfg== X-Received: by 10.236.148.38 with SMTP id u26mr12568972yhj.48.1366624798651; Mon, 22 Apr 2013 02:59:58 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.47.34 with SMTP id a2ls3042684qen.73.gmail; Mon, 22 Apr 2013 02:59:58 -0700 (PDT) X-Received: by 10.52.233.5 with SMTP id ts5mr15701016vdc.77.1366624798533; Mon, 22 Apr 2013 02:59:58 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id mo2si15564644vec.4.2013.04.22.02.59.58 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Apr 2013 02:59:58 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.170 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.170; Received: by mail-vc0-f170.google.com with SMTP id hv10so2353881vcb.1 for ; Mon, 22 Apr 2013 02:59:58 -0700 (PDT) X-Received: by 10.52.166.103 with SMTP id zf7mr15767747vdb.94.1366624798421; Mon, 22 Apr 2013 02:59:58 -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 nf2csp68937veb; Mon, 22 Apr 2013 02:59:57 -0700 (PDT) X-Received: by 10.180.74.146 with SMTP id t18mr35859317wiv.26.1366624797512; Mon, 22 Apr 2013 02:59:57 -0700 (PDT) Received: from eu1sys200aog108.obsmtp.com (eu1sys200aog108.obsmtp.com [207.126.144.125]) by mx.google.com with SMTP id i8si4916597eem.251.2013.04.22.02.59.48 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 22 Apr 2013 02:59:57 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.125 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.125; Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob108.postini.com ([207.126.147.11]) with SMTP ID DSNKUXUKD7V5I7Eu+TZUx3H41vkDhuNXnubW@postini.com; Mon, 22 Apr 2013 09:59:57 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 C5715189; Mon, 22 Apr 2013 09:59:42 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id A907B48A1; Mon, 22 Apr 2013 09:59:36 +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 relay2.stm.gmessaging.net (Postfix) with ESMTPS id EE6A1A8074; Mon, 22 Apr 2013 11:59:37 +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; Mon, 22 Apr 2013 11:59:41 +0200 From: Linus Walleij To: , Vinod Koul , Dan Williams Cc: Arnd Bergmann , , Linus Walleij Subject: [PATCH 19/23] ARM: u300: add the COH 901 318 DMAC to device tree Date: Mon, 22 Apr 2013 11:59:39 +0200 Message-ID: <1366624779-6820-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: ALoCoQnKA5j/RUu8bWQNbey+P14sNcxWNnRP26wz3HECwxSBSOcpF50H/Y2VS0/yXSDhLJ65U7jz X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.170 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 | 7 +++++++ arch/arm/mach-u300/core.c | 2 ++ 2 files changed, 9 insertions(+) diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts index ee747fe..cdffeb9 100644 --- a/arch/arm/boot/dts/ste-u300.dts +++ b/arch/arm/boot/dts/ste-u300.dts @@ -68,6 +68,13 @@ interrupts = <10>; }; + dmac: dmac@c00020000 { + compatible = "stericsson,coh901318"; + reg = <0xc0020000 0x1000>; + interrupt-parent = <&vica>; + interrupts = <2>; + }; + 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 20d6c46..98d4dbe 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -713,6 +713,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,