Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1591601

[PATCH v2 2/3] ARM: dts: bcm5301x: Add TWD WD Support to DT

From Jon Mason <jon.mason@broadcom.com>
Newsgroups linux.kernel
Subject [PATCH v2 2/3] ARM: dts: bcm5301x: Add TWD WD Support to DT
Date 2017-03-03 02:30 +0100
Message-ID <tgKcF-29z-1@gated-at.bofh.it> (permalink)
References <tgJqh-1AZ-15@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


From: Jon Mason <jonmason@broadcom.com>

Add support for the ARM TWD Watchdog to the bcm5301x device tree.  The
ARM TWD timer allocated the register space for the WDT, so this patch
necessitated shrinking that.  Also, the GIC masks were added for these.

Signed-off-by: Jon Mason <jonmason@broadcom.com>
---
 arch/arm/boot/dts/bcm5301x.dtsi | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index 00de62d..4e3fbce 100644
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -70,10 +70,19 @@
 			clocks = <&periph_clk>;
 		};
 
-		local-timer@20600 {
+		timer@20600 {
 			compatible = "arm,cortex-a9-twd-timer";
-			reg = <0x20600 0x100>;
-			interrupts = <GIC_PPI 13 IRQ_TYPE_EDGE_RISING>;
+			reg = <0x20600 0x20>;
+			interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
+						  IRQ_TYPE_EDGE_RISING)>;
+			clocks = <&periph_clk>;
+		};
+
+		watchdog@20620 {
+			compatible = "arm,cortex-a9-twd-wdt";
+			reg = <0x20620 0x20>;
+			interrupts = <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) |
+						  IRQ_TYPE_EDGE_RISING)>;
 			clocks = <&periph_clk>;
 		};
 
-- 
2.7.4

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH v2 0/3] ARM: dts: BCM5301X: GIC_PPI bug, TWD WD and i2c Support Jon Mason <jon.mason@broadcom.com> - 2017-03-03 01:40 +0100
  [PATCH v2 2/3] ARM: dts: bcm5301x: Add TWD WD Support to DT Jon Mason <jon.mason@broadcom.com> - 2017-03-03 02:30 +0100
  [PATCH v2 3/3] ARM: dts: bcm5301x: Add I2C support to the DT Jon Mason <jon.mason@broadcom.com> - 2017-03-03 11:10 +0100
    Re: [PATCH v2 3/3] ARM: dts: bcm5301x: Add I2C support to the DT Florian Fainelli <f.fainelli@gmail.com> - 2017-03-06 02:30 +0100
      Re: [PATCH v2 3/3] ARM: dts: bcm5301x: Add I2C support to the DT Jon Mason <jon.mason@broadcom.com> - 2017-03-06 16:50 +0100

csiph-web