From patchwork Mon Apr 22 09:55:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 16297 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f198.google.com (mail-qc0-f198.google.com [209.85.216.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BFC4725DEE for ; Mon, 22 Apr 2013 09:56:26 +0000 (UTC) Received: by mail-qc0-f198.google.com with SMTP id v20sf9724926qcm.9 for ; Mon, 22 Apr 2013 02:55:40 -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=HXubTvB3/or0T01L+tWfb5F/MNcZg0A4W2FcNBKZDUc=; b=YY81nkxjhQIYcCE9Fjuuge3N+e4HCCCOjcWaV2yVy+WZ/xyJsog/nhPnwwVvvNLgKu BojIyxYMs5kIGtGVjTPpmKq4PgahPjTV+XfeMnzDjuQp/dKVYYOqt7uaI+yJR70X/hyX hi2nOpzxw/fYAZIOGC+z9785aTYi5PoxRD5U1eWyITDpW+yTLkn6LYoarCvbF81gDco8 7Pc+lknCjWvMmXgn4fuG5TvPogXHttzBwatFn+WQTd8cAQLXBTFqf0OQ75L7zqthdxZy dhZwitQFGDxDO/fp4g+asrC4DnmJPrxwYByRtNP5Vb+B2+ZL/S5iuyuT9Z2LtagyN9TJ gG7w== X-Received: by 10.236.231.170 with SMTP id l40mr2876950yhq.16.1366624540632; Mon, 22 Apr 2013 02:55:40 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.4.71 with SMTP id i7ls3106138qei.86.gmail; Mon, 22 Apr 2013 02:55:40 -0700 (PDT) X-Received: by 10.220.147.79 with SMTP id k15mr4364388vcv.38.1366624540501; Mon, 22 Apr 2013 02:55:40 -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 ha8si7228545vdb.48.2013.04.22.02.55.40 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Apr 2013 02:55:40 -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 ib11so2796536vcb.9 for ; Mon, 22 Apr 2013 02:55:40 -0700 (PDT) X-Received: by 10.52.34.168 with SMTP id a8mr15705107vdj.75.1366624540375; Mon, 22 Apr 2013 02:55:40 -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 nf2csp68790veb; Mon, 22 Apr 2013 02:55:39 -0700 (PDT) X-Received: by 10.194.93.231 with SMTP id cx7mr43872513wjb.33.1366624539202; Mon, 22 Apr 2013 02:55:39 -0700 (PDT) Received: from eu1sys200aog119.obsmtp.com (eu1sys200aog119.obsmtp.com [207.126.144.147]) by mx.google.com with SMTP id m44si38576290eeo.180.2013.04.22.02.55.30 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 22 Apr 2013 02:55:39 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.147 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.147; Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob119.postini.com ([207.126.147.11]) with SMTP ID DSNKUXUJEZexw+3ljuGcCOYzLCq418Bm1fBN@postini.com; Mon, 22 Apr 2013 09:55:39 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id 4EDDE5C; Mon, 22 Apr 2013 09:54:27 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id 430203F; Mon, 22 Apr 2013 03:03:54 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id E769424C07C; Mon, 22 Apr 2013 11:55:16 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.279.5; Mon, 22 Apr 2013 11:55:22 +0200 From: Linus Walleij To: , Wim Van Sebroeck , Cc: Arnd Bergmann , , Linus Walleij Subject: [PATCH 10/23] ARM: u300: add the COH 901 327 watchdog to device tree Date: Mon, 22 Apr 2013 11:55:18 +0200 Message-ID: <1366624518-6471-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: ALoCoQlCJwOcScxJaRKwgA4BnTtWtoYOjJSIeflqgIzdeunHzEcBT6ouRxTSH8dDErdgu9weV/At 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 the COH 901 327 watchdog to the U300 device tree. 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 9c08d5e..b1b63bb 100644 --- a/arch/arm/boot/dts/ste-u300.dts +++ b/arch/arm/boot/dts/ste-u300.dts @@ -49,6 +49,13 @@ reg = <0xc0011000 0x1000>; }; + watchdog: watchdog@c0012000 { + compatible = "stericsson,coh901327"; + reg = <0xc0012000 0x1000>; + interrupt-parent = <&vicb>; + interrupts = <3>; + }; + 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 fedad38..f97b65c 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -709,6 +709,8 @@ static struct of_dev_auxdata u300_auxdata_lookup[] __initdata = { "pinctrl-u300", NULL), OF_DEV_AUXDATA("stericsson,gpio-coh901", U300_GPIO_BASE, "u300-gpio", &u300_gpio_plat), + OF_DEV_AUXDATA("stericsson,coh901327", U300_WDOG_BASE, + "coh901327_wdog", NULL), OF_DEV_AUXDATA("arm,primecell", U300_UART0_BASE, "uart0", &uart0_plat_data), OF_DEV_AUXDATA("arm,primecell", U300_UART1_BASE,