devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Matthias Brugger <matthias.bgg@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: linux@arm.linux.org.uk, robh+dt@kernel.org, pawel.moll@arm.com,
	mark.rutland@arm.com, ijc+devicetree@hellion.org.uk,
	galak@codeaurora.org, olof@lixom.net, arnd@arndb.de,
	jason@lakedaemon.net, thomas.petazzoni@free-electrons.com,
	swarren@nvidia.com, sebastian.hesselbarth@gmail.com,
	stefan@agner.ch, maxime.ripard@free-electrons.com,
	matthias.bgg@gmail.com, anders.berg@lsi.com,
	linus.walleij@linaro.org, heiko@sntech.de,
	devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH 7/7] arm: dts: mt6589: Add arm arch timer node
Date: Thu, 31 Jul 2014 18:42:23 +0200	[thread overview]
Message-ID: <1406824943-24052-8-git-send-email-matthias.bgg@gmail.com> (raw)
In-Reply-To: <1406824943-24052-1-git-send-email-matthias.bgg@gmail.com>

This patch adds the device tree node for the arm architecture timer.

Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
---
 arch/arm/boot/dts/mt6589.dtsi |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/mt6589.dtsi b/arch/arm/boot/dts/mt6589.dtsi
index 742c9bd..7bcf031 100644
--- a/arch/arm/boot/dts/mt6589.dtsi
+++ b/arch/arm/boot/dts/mt6589.dtsi
@@ -73,14 +73,22 @@
 		compatible = "simple-bus";
 		ranges;
 
-		timer: timer@10008000 {
+		timer1: timer@10008000 {
 			compatible = "mediatek,mt6577-timer";
-			reg = <0x10008000 0x80>;
+			reg = <0x10008000 0x60>;
 			interrupts = <GIC_SPI 113 IRQ_TYPE_EDGE_RISING>;
 			clocks = <&system_clk>, <&rtc_clk>;
 			clock-names = "system-clk", "rtc-clk";
 		};
 
+		timer2: timer {
+			compatible = "arm,armv7-timer";
+			interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+				     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+				     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+				     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
+		};
+
 		gic: interrupt-controller@10211000 {
 			compatible = "arm,cortex-a15-gic";
 			interrupt-controller;
-- 
1.7.9.5

      parent reply	other threads:[~2014-07-31 16:42 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-31 16:42 [PATCH 0/7] arm: mediatek: Add more basic features Matthias Brugger
2014-07-31 16:42 ` [PATCH 1/7] arm: dts: Build dtb for Mediatek board Matthias Brugger
2014-07-31 16:42 ` [PATCH 2/7] arm: multi_v7_defconfig: Enable Mediatek platform Matthias Brugger
2014-07-31 16:42 ` [PATCH 3/7] arm: dts: mt6589: Fix typo in GIC unit address Matthias Brugger
2014-07-31 16:42 ` [PATCH 4/7] arm: mediatek: Add earlyprintk support for mt6589 Matthias Brugger
2014-07-31 16:42 ` [PATCH 5/7] arm: dts: mt6589-aquaris5: Add boot argument earlyprintk Matthias Brugger
2014-07-31 16:42 ` [PATCH 6/7] arm: mediatek: enable gpt6 on boot up to make arch timer working Matthias Brugger
2014-08-11  7:15   ` Linus Walleij
2014-08-12  9:02     ` Matthias Brugger
     [not found]       ` <CABuKBe+Q3tnN0s22EMY-dK_6FeN_xN9SmrsW3dPONR6QDJ+V_w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-08-12 15:03         ` Rob Herring
2014-08-13  8:47         ` Linus Walleij
2014-08-13  9:29           ` Matthias Brugger
2014-10-24 13:53             ` Yingjoe Chen
2014-10-27 10:28               ` Matthias Brugger
2014-10-30  3:23                 ` Yingjoe Chen
2014-10-30  9:01                   ` Matthias Brugger
2014-08-14  2:24       ` Joe.C
2014-08-14  9:35         ` Matthias Brugger
2014-07-31 16:42 ` Matthias Brugger [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1406824943-24052-8-git-send-email-matthias.bgg@gmail.com \
    --to=matthias.bgg@gmail.com \
    --cc=anders.berg@lsi.com \
    --cc=arnd@arndb.de \
    --cc=devicetree@vger.kernel.org \
    --cc=galak@codeaurora.org \
    --cc=heiko@sntech.de \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=jason@lakedaemon.net \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=mark.rutland@arm.com \
    --cc=maxime.ripard@free-electrons.com \
    --cc=olof@lixom.net \
    --cc=pawel.moll@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=sebastian.hesselbarth@gmail.com \
    --cc=stefan@agner.ch \
    --cc=swarren@nvidia.com \
    --cc=thomas.petazzoni@free-electrons.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).