diff options
| -rw-r--r-- | 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, 9 insertions, 1 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 864e3bb5a07..eb22af7fa1f 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -160,7 +160,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 cbadd5e996a..f17955b45e6 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -143,6 +143,7 @@ static struct platform_device db8500_prcmu_device = { static struct platform_device *platform_devs[] __initdata = { &u8500_dma40_device, &db8500_pmu_device, + &ux500_prcmu_wdt_device, &db8500_prcmu_device, }; diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index f832bbbcef2..41ced007cf4 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c @@ -444,6 +444,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; |