aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2008-11-28 00:49:22 -0500
committerEric Miao <eric.miao@marvell.com>2008-12-02 01:42:38 -0500
commitb31eca4f006c3efdd2dc501270172aa7ff8614b9 (patch)
tree8ac6d6238f23af0cb68cfe2069a4433b20a716e8
parenta07efb5dac2a1c9125b9bd84d2f9ea4803d93e60 (diff)
[ARM] pxa: move pxa2xx specific PWRMODE definitions into pxa2xx-regs.h
Signed-off-by: Eric Miao <eric.miao@marvell.com>
-rw-r--r--arch/arm/mach-pxa/include/mach/pxa-regs.h7
-rw-r--r--arch/arm/mach-pxa/include/mach/pxa2xx-regs.h7
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pxa-regs.h b/arch/arm/mach-pxa/include/mach/pxa-regs.h
index 859b35e1a7ee..ab62f6c11e0e 100644
--- a/arch/arm/mach-pxa/include/mach/pxa-regs.h
+++ b/arch/arm/mach-pxa/include/mach/pxa-regs.h
@@ -553,11 +553,4 @@
553 * Core Clock - see arch/arm/mach-pxa/include/mach/pxa2xx-regs.h 553 * Core Clock - see arch/arm/mach-pxa/include/mach/pxa2xx-regs.h
554 */ 554 */
555 555
556/* PWRMODE register M field values */
557
558#define PWRMODE_IDLE 0x1
559#define PWRMODE_STANDBY 0x2
560#define PWRMODE_SLEEP 0x3
561#define PWRMODE_DEEPSLEEP 0x7
562
563#endif 556#endif
diff --git a/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h b/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h
index 806ecfea44bf..2b71d87c898f 100644
--- a/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h
+++ b/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h
@@ -243,4 +243,11 @@
243#define OSCC_OON (1 << 1) /* 32.768kHz OON (write-once only bit) */ 243#define OSCC_OON (1 << 1) /* 32.768kHz OON (write-once only bit) */
244#define OSCC_OOK (1 << 0) /* 32.768kHz OOK (read-only bit) */ 244#define OSCC_OOK (1 << 0) /* 32.768kHz OOK (read-only bit) */
245 245
246/* PWRMODE register M field values */
247
248#define PWRMODE_IDLE 0x1
249#define PWRMODE_STANDBY 0x2
250#define PWRMODE_SLEEP 0x3
251#define PWRMODE_DEEPSLEEP 0x7
252
246#endif 253#endif