diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:13:52 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:13:52 +0200 |
| commit | 6684215bb60c3093231ff61a52ae59fb30e043ac (patch) | |
| tree | 70304bd22ea1b13c951d86ff6c177d107ea46c3c /drivers/mfd/dbx500-prcmu-regs.h | |
| parent | bb14f8e91a4d2bdb8643f6f166299ada8d015377 (diff) | |
| parent | 85141dd3025c5c41d921220ddac6fdb8e2393040 (diff) | |
Merge remote-tracking branch 'linaro-tracking/tracking-linaro_cpuidle' into integration-linux-ux500-3.3
Conflicts:
arch/arm/mach-ux500/Makefile
drivers/mfd/db8500-prcmu.c
include/linux/mfd/db8500-prcmu.h
include/linux/mfd/dbx500-prcmu.h
Diffstat (limited to 'drivers/mfd/dbx500-prcmu-regs.h')
| -rw-r--r-- | drivers/mfd/dbx500-prcmu-regs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/dbx500-prcmu-regs.h b/drivers/mfd/dbx500-prcmu-regs.h index 29c106b5c16..d2cbe214516 100644 --- a/drivers/mfd/dbx500-prcmu-regs.h +++ b/drivers/mfd/dbx500-prcmu-regs.h @@ -79,6 +79,8 @@ /* ARM WFI Standby signal register */ #define PRCM_ARM_WFI_STANDBY (_PRCMU_BASE + 0x130) +#define PRCM_ARM_WFI_STANDBY_WFI0 0x08 +#define PRCM_ARM_WFI_STANDBY_WFI1 0x10 #define PRCM_IOCR (_PRCMU_BASE + 0x310) #define PRCM_IOCR_IOFORCE 0x1 |