aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Aaberg <jonas.aberg@stericsson.com>2011-06-14 11:58:03 +0200
committersaid m bagheri <ebgheri@steludxu2848.(none)>2011-06-29 10:30:34 +0200
commit3d0533f6292f43ebb1eb6adabb3df80f4aec08e7 (patch)
tree7167583b73660e1a422f8c29b349a7e90aa6c096
parenteefb1f48cd64af76e8b20d4610cabbfc2355fc14 (diff)
downloadlinux-2.6.38-lt-ux500-3d0533f6292f43ebb1eb6adabb3df80f4aec08e7.tar.gz
ARM: ux500: Add platform data for prcmu watchdog
ST-Ericsson Linux next: Not tested, ask SSM for ER ST-Ericsson ID: 339924 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I952da9c66e20183fb45ee2d67164e75152863ce8 Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25030 Reviewed-by: QATEST Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
-rw-r--r--arch/arm/configs/u8500_defconfig3
-rw-r--r--arch/arm/mach-ux500/cpu-db8500.c1
-rw-r--r--arch/arm/mach-ux500/devices-db8500.c5
-rw-r--r--arch/arm/mach-ux500/include/mach/devices.h1
4 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 07c8f198f79..64295e21bae 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -165,7 +165,8 @@ CONFIG_SENSORS_DB8500=y
CONFIG_SENSORS_LSM303DLH=y
CONFIG_SENSORS_L3G4200D=y
CONFIG_WATCHDOG=y
-CONFIG_MPCORE_WATCHDOG=y
+CONFIG_UX500_WATCHDOG=y
+CONFIG_UX500_WATCHDOG_DEBUG=y
CONFIG_MFD_STMPE=y
CONFIG_MFD_TC3589X=y
CONFIG_AB5500_CORE=y
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index d9aaa92d619..de9896cf133 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -373,6 +373,7 @@ static struct platform_device db8500_regulator_device = {
static struct platform_device *platform_devs[] __initdata = {
&u8500_dma40_device,
&db8500_pmu_device,
+ &ux500_prcmu_wdt_device,
&db8500_regulator_device,
};
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
index 3eb5e3ad375..6ab9429dacc 100644
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@ -443,6 +443,11 @@ struct platform_device ux500_wdt_device = {
.num_resources = ARRAY_SIZE(ux500_wdt_resources),
};
+struct platform_device ux500_prcmu_wdt_device = {
+ .name = "ux500_wdt",
+ .id = -1,
+};
+
/*
* HSI
*/
diff --git a/arch/arm/mach-ux500/include/mach/devices.h b/arch/arm/mach-ux500/include/mach/devices.h
index 1c36405f29d..ae4d895eb28 100644
--- a/arch/arm/mach-ux500/include/mach/devices.h
+++ b/arch/arm/mach-ux500/include/mach/devices.h
@@ -25,6 +25,7 @@ extern struct amba_device ux500_pl031_device;
extern struct platform_device ux500_hash1_device;
extern struct platform_device ux500_cryp1_device;
extern struct platform_device ux500_wdt_device;
+extern struct platform_device ux500_prcmu_wdt_device;
extern struct platform_device mloader_fw_device;
extern struct platform_device u8500_thsens_device;
extern struct platform_device u8500_dma40_device;