diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2011-09-21 09:33:01 +0200 |
|---|---|---|
| committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-09-29 08:58:22 +0200 |
| commit | d76ed1790418ece795b28625a7a1c0ce89af16b1 (patch) | |
| tree | aaa334cf73faf8220d3c184db6fefed59515f884 | |
| parent | ea4fb36bddd96459395159a808a908fc2f59d595 (diff) | |
ARM: ux500: Use u8500_wdt
Enalbe the u8500 watchdog including debug for u8500 builds.
Change-Id: I48b2a181e091c3095299646be376b7953a7d849c
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32090
| -rwxr-xr-x | arch/arm/configs/u8500_defconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/devices-db8500.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/devices.h | 1 |
4 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index a6a882d719b..ba1f076c64c 100755 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -205,6 +205,9 @@ CONFIG_SENSORS_AB8500=y CONFIG_SENSORS_DBX500=y CONFIG_SENSORS_LSM303DLH=y CONFIG_SENSORS_L3G4200D=y +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +CONFIG_U8500_WATCHDOG_DEBUG=y CONFIG_MFD_STMPE=y CONFIG_MFD_TC3589X=y CONFIG_MFD_DB8500_PRCMU=y diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 10de2032fd8..d2def0828a6 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -133,6 +133,7 @@ static struct platform_device *platform_devs[] __initdata = { &u8500_gpio_devs[8], &db8500_pmu_device, &db8500_prcmu_device, + &u8500_wdt_device, }; static int usb_db8500_rx_dma_cfg[] = { diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index 583ed2b104d..b7b98829a0e 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c @@ -274,6 +274,11 @@ struct platform_device ux500_b2r2_device = { .resource = b2r2_resources, }; +struct platform_device u8500_wdt_device = { + .name = "u8500_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 d18ce32e486..212660f1aba 100644 --- a/arch/arm/mach-ux500/include/mach/devices.h +++ b/arch/arm/mach-ux500/include/mach/devices.h @@ -27,6 +27,7 @@ extern struct platform_device ux500_cryp1_device; extern struct platform_device mloader_fw_device; extern struct platform_device ux500_thsens_device; extern struct platform_device ux500_ske_keypad_device; +extern struct platform_device u8500_wdt_device; extern struct platform_device u8500_hsi_device; extern struct platform_device ux500_mmio_device; extern struct platform_device u5500_mmio_device; |