From 70986324638b5c90dcd6ea8eee09e08bb59129e7 Mon Sep 17 00:00:00 2001
From: Fabio Baltieri <fabio.baltieri@linaro.org>
Date: Fri, 18 Jan 2013 12:40:14 +0100
Subject: [PATCH] --- yaml --- r: 357595 b: refs/heads/master c:
 b3aac62bbb1c3f8e71c88e6e477836def3058fe8 h: refs/heads/master i:   357593:
 28e43ee0c9db7b6313d9ec0d3e6a4c58b3f91a2c   357591:
 878337d9857f1be56a3874ad6631bf91ea99083f v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/mfd/db8500-prcmu.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f84b46260a9f..62c57f04127d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0e5bd412fde30de3839c8dfa93a3e19e71ee462
+refs/heads/master: b3aac62bbb1c3f8e71c88e6e477836def3058fe8
diff --git a/trunk/drivers/mfd/db8500-prcmu.c b/trunk/drivers/mfd/db8500-prcmu.c
index 7a63fa86bf01..e42a417adc5f 100644
--- a/trunk/drivers/mfd/db8500-prcmu.c
+++ b/trunk/drivers/mfd/db8500-prcmu.c
@@ -32,6 +32,7 @@
 #include <linux/regulator/db8500-prcmu.h>
 #include <linux/regulator/machine.h>
 #include <linux/cpufreq.h>
+#include <linux/platform_data/ux500_wdt.h>
 #include <asm/hardware/gic.h>
 #include <mach/hardware.h>
 #include <mach/irqs.h>
@@ -3074,6 +3075,11 @@ static struct resource ab8500_resources[] = {
 	}
 };
 
+static struct ux500_wdt_data db8500_wdt_pdata = {
+	.timeout = 600, /* 10 minutes */
+	.has_28_bits_resolution = true,
+};
+
 static struct mfd_cell db8500_prcmu_devs[] = {
 	{
 		.name = "db8500-prcmu-regulators",
@@ -3087,6 +3093,12 @@ static struct mfd_cell db8500_prcmu_devs[] = {
 		.platform_data = &db8500_cpufreq_table,
 		.pdata_size = sizeof(db8500_cpufreq_table),
 	},
+	{
+		.name = "ux500_wdt",
+		.platform_data = &db8500_wdt_pdata,
+		.pdata_size = sizeof(db8500_wdt_pdata),
+		.id = -1,
+	},
 	{
 		.name = "ab8500-core",
 		.of_compatible = "stericsson,ab8500",