From 8219923c26894a93296d57277bc1a59f887cac88 Mon Sep 17 00:00:00 2001
From: Vincenzo Frascino <vincenzo.frascino@linaro.org>
Date: Thu, 11 May 2017 11:19:27 +0100
Subject: [PATCH] dts: v2m_beetle: Add WDOG support

This patch adds the ARM CMSDK WDOG support to the V2M Beetle device
tree.

Signed-off-by: Vincenzo Frascino <vincenzo.frascino@linaro.org>
---
 arch/arm/soc/arm/beetle/soc.h        |  3 ---
 dts/arm/v2m_beetle.dts               |  5 +++++
 dts/arm/v2m_beetle.fixup             |  3 +++
 dts/arm/yaml/arm,cmsdk-watchdog.yaml | 21 +++++++++++++++++++++
 4 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 dts/arm/yaml/arm,cmsdk-watchdog.yaml

diff --git a/arch/arm/soc/arm/beetle/soc.h b/arch/arm/soc/arm/beetle/soc.h
index 2ddc19454e7..c2a997c9411 100644
--- a/arch/arm/soc/arm/beetle/soc.h
+++ b/arch/arm/soc/arm/beetle/soc.h
@@ -113,9 +113,6 @@
 /* CMSDK APB Dual Timer */
 #define CMSDK_APB_DTIMER _BEETLE_DTIMER_BASE
 
-/* CMSDK APB Watchdog */
-#define CMSDK_APB_WDOG _BEETLE_WDOG_BASE
-
 #endif /* !_ASMLANGUAGE */
 
 #endif /* _ARM_BEETLE_SOC_H_ */
diff --git a/dts/arm/v2m_beetle.dts b/dts/arm/v2m_beetle.dts
index e72f60827f3..c4d678f936c 100644
--- a/dts/arm/v2m_beetle.dts
+++ b/dts/arm/v2m_beetle.dts
@@ -43,6 +43,11 @@
 			interrupts = <IRQ_UART1 3>;
 			current-speed = <115200>;
 		};
+
+		wdog0: wdog@40008000 {
+			compatible = "arm,cmsdk-watchdog";
+			reg = <0x40008000 0x1000>;
+		};
 	};
 };
 
diff --git a/dts/arm/v2m_beetle.fixup b/dts/arm/v2m_beetle.fixup
index f810397fba9..b2b8bccafe4 100644
--- a/dts/arm/v2m_beetle.fixup
+++ b/dts/arm/v2m_beetle.fixup
@@ -10,3 +10,6 @@
 #define CMSDK_APB_UART_1_IRQ			ARM_CMSDK_UART_40005000_IRQ_0
 #define CONFIG_UART_CMSDK_APB_PORT1_IRQ_PRI	ARM_CMSDK_UART_40005000_IRQ_0_PRIORITY
 #define CONFIG_UART_CMSDK_APB_PORT1_BAUD_RATE	ARM_CMSDK_UART_40005000_CURRENT_SPEED
+
+/* CMSDK APB Watchdog */
+#define CMSDK_APB_WDOG				ARM_CMSDK_WATCHDOG_40008000_BASE_ADDRESS_0
diff --git a/dts/arm/yaml/arm,cmsdk-watchdog.yaml b/dts/arm/yaml/arm,cmsdk-watchdog.yaml
new file mode 100644
index 00000000000..7dea45bccff
--- /dev/null
+++ b/dts/arm/yaml/arm,cmsdk-watchdog.yaml
@@ -0,0 +1,21 @@
+---
+title: ARM CMSDK WATCHDOG
+id: arm,cmsdk-watchdog
+version: 0.1
+
+description: >
+    This binding gives a base representation of the ARM CMSDK WATCHDOG
+
+properties:
+  - compatible:
+      type: string
+      category: required
+      description: compatible strings
+      constraint: "arm,cmsdk-watchdog"
+
+  - reg:
+      type: array
+      description: mmio register space
+      generation: define
+      category: required
+...