Message ID | 1431595354-2101-1-git-send-email-linus.walleij@linaro.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <patchwork-forward+bncBDE6RCFOWIARB6GT2GVAKGQEJ6BZM5Q@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8FCAA2121F for <linaro@patches.linaro.org>; Thu, 14 May 2015 09:25:13 +0000 (UTC) Received: by wgiv13 with SMTP id v13sf16995196wgi.3 for <linaro@patches.linaro.org>; Thu, 14 May 2015 02:25:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id:cc :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=RvuqHJIx8ded0T/revSBnj6FEUZHAmh9E0ZrYSHB/eE=; b=HZk3UF0hy2g3A9z5HrYZgv8K81SshRhnw33kKGTAJNBb22mqxHLn4uNpFCg1fBxfY9 S7rE2vmcAIuXTHzEDJT7QW49r6bBLFGECSRj5El96oRi5AiIhlV8J+tppm23H4rJnRZM tZMtIEfgj1TzwE9t+FoTmkPLDv+8eWgkviHQcJUzj8FhKzaxdwfa4tBRWLRysyvB9s8O IcktI4/Ou7FAf57fn7KE01iVzSwwMbkh7P0TLsqJxyZFhsuSfLDbd11VUB/3wV1cgv6I zVZY64Eyqfk/QhNPi33lrMbBIOF4ooRj9+yFQXobye/6/VYTmYl3qJ8XnwMgLvE0+mr2 yuVQ== X-Gm-Message-State: ALoCoQkgYDXMqe20QNeK/EVEUayfAoOqtMRbwEYn2V7eA8EEmNiZTOELRxCSkGIo+qPIUr8SAAYG X-Received: by 10.194.179.42 with SMTP id dd10mr2410346wjc.7.1431595512819; Thu, 14 May 2015 02:25:12 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.206.98 with SMTP id ln2ls386834lac.61.gmail; Thu, 14 May 2015 02:25:12 -0700 (PDT) X-Received: by 10.112.16.42 with SMTP id c10mr2425811lbd.103.1431595512663; Thu, 14 May 2015 02:25:12 -0700 (PDT) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id f3si14126665lam.36.2015.05.14.02.25.12 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2015 02:25:12 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by lagv1 with SMTP id v1so58961730lag.3 for <patchwork-forward@linaro.org>; Thu, 14 May 2015 02:25:12 -0700 (PDT) X-Received: by 10.112.219.70 with SMTP id pm6mr2367622lbc.41.1431595512566; Thu, 14 May 2015 02:25:12 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1114589lbb; Thu, 14 May 2015 02:25:11 -0700 (PDT) X-Received: by 10.70.47.68 with SMTP id b4mr6316596pdn.33.1431595509904; Thu, 14 May 2015 02:25:09 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id qf2si2360330pbb.35.2015.05.14.02.25.09 for <patch@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2015 02:25:09 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YspMF-0006H4-VJ; Thu, 14 May 2015 09:23:11 +0000 Received: from mail-la0-f45.google.com ([209.85.215.45]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YspM8-00065y-DE for linux-arm-kernel@lists.infradead.org; Thu, 14 May 2015 09:23:05 +0000 Received: by labbd9 with SMTP id bd9so58946312lab.2 for <linux-arm-kernel@lists.infradead.org>; Thu, 14 May 2015 02:22:40 -0700 (PDT) X-Received: by 10.112.161.226 with SMTP id xv2mr2495151lbb.106.1431595360796; Thu, 14 May 2015 02:22:40 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id lc8sm5934562lbc.33.2015.05.14.02.22.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2015 02:22:39 -0700 (PDT) From: Linus Walleij <linus.walleij@linaro.org> To: arm@kernel.org Subject: [PATCH] ARM: ux500: add SCU and WD to device tree Date: Thu, 14 May 2015 11:22:34 +0200 Message-Id: <1431595354-2101-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150514_022304_706571_15AF43B5 X-CRM114-Status: GOOD ( 11.74 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.215.45 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.45 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Linus Walleij <linus.walleij@linaro.org>, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 |
diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi index 5b876f263af4..f024a1c0de8b 100644 --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi @@ -185,6 +185,11 @@ <0xa0410100 0x100>; }; + scu@a04100000 { + compatible = "arm,cortex-a9-scu"; + reg = <0xa0410000 0x100>; + }; + L2: l2-cache { compatible = "arm,pl310-cache"; reg = <0xa0412000 0x1000>; @@ -245,6 +250,13 @@ clocks = <&smp_twd_clk>; }; + watchdog@a0410620 { + compatible = "arm,cortex-a9-twd-wdt"; + reg = <0xa0410620 0x20>; + interrupts = <1 14 0x304>; + clocks = <&smp_twd_clk>; + }; + rtc@80154000 { compatible = "arm,rtc-pl031", "arm,primecell"; reg = <0x80154000 0x1000>;
The Ux500 like other Cortex-A9 SoC's has a Snoop Control Unit (SCU) and a Watchdog in the same address range as the local timers. Add these to the SoC device tree. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- ARM SoC folks: if it looks OK, please apply this directly to the DT branch with other ux500 DT changes, this is needed for cleanups when we want to remap the SCU from the DT. --- arch/arm/boot/dts/ste-dbx5x0.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+)