diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-19 08:39:58 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-19 08:39:58 -0400 |
| commit | 14b6848bc0134b8838d374c423df3edda9b1490e (patch) | |
| tree | 724dc912efe84f432d33a798502811c5f5295774 /arch/arm/mach-omap2/prm-regbits-34xx.h | |
| parent | 05d9881bc4c6f172997b7a59e4a1a95910c4ebd7 (diff) | |
| parent | 4da3782151300237db3abe070f716922889252e0 (diff) | |
Merge branch 'omap-clks3' into devel
Conflicts:
arch/arm/mach-omap2/clock.c
Diffstat (limited to 'arch/arm/mach-omap2/prm-regbits-34xx.h')
| -rw-r--r-- | arch/arm/mach-omap2/prm-regbits-34xx.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/prm-regbits-34xx.h b/arch/arm/mach-omap2/prm-regbits-34xx.h index 5b5ecfe6c999..c6a7940f4287 100644 --- a/arch/arm/mach-omap2/prm-regbits-34xx.h +++ b/arch/arm/mach-omap2/prm-regbits-34xx.h | |||
| @@ -366,6 +366,7 @@ | |||
| 366 | 366 | ||
| 367 | /* PM_WKEN_WKUP specific bits */ | 367 | /* PM_WKEN_WKUP specific bits */ |
| 368 | #define OMAP3430_EN_IO (1 << 8) | 368 | #define OMAP3430_EN_IO (1 << 8) |
| 369 | #define OMAP3430_EN_GPIO1 (1 << 3) | ||
| 369 | 370 | ||
| 370 | /* PM_MPUGRPSEL_WKUP specific bits */ | 371 | /* PM_MPUGRPSEL_WKUP specific bits */ |
| 371 | 372 | ||
| @@ -452,6 +453,14 @@ | |||
| 452 | #define OMAP3430_CMDRA0_MASK (0xff << 0) | 453 | #define OMAP3430_CMDRA0_MASK (0xff << 0) |
| 453 | 454 | ||
| 454 | /* PRM_VC_CMD_VAL_0 specific bits */ | 455 | /* PRM_VC_CMD_VAL_0 specific bits */ |
| 456 | #define OMAP3430_VC_CMD_ON_SHIFT 24 | ||
| 457 | #define OMAP3430_VC_CMD_ON_MASK (0xFF << 24) | ||
| 458 | #define OMAP3430_VC_CMD_ONLP_SHIFT 16 | ||
| 459 | #define OMAP3430_VC_CMD_ONLP_MASK (0xFF << 16) | ||
| 460 | #define OMAP3430_VC_CMD_RET_SHIFT 8 | ||
| 461 | #define OMAP3430_VC_CMD_RET_MASK (0xFF << 8) | ||
| 462 | #define OMAP3430_VC_CMD_OFF_SHIFT 0 | ||
| 463 | #define OMAP3430_VC_CMD_OFF_MASK (0xFF << 0) | ||
| 455 | 464 | ||
| 456 | /* PRM_VC_CMD_VAL_1 specific bits */ | 465 | /* PRM_VC_CMD_VAL_1 specific bits */ |
| 457 | 466 | ||