Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 223290
b: refs/heads/master
c: c2015dc
h: refs/heads/master
v: v3
  • Loading branch information
Paul Walmsley authored and Tony Lindgren committed Dec 11, 2010
1 parent b348f8a commit d7a088c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e83df17f178360a8e7874441bca04a710c869e42
refs/heads/master: c2015dc88a57090bcf67ab7cfcdbc34671598d36
11 changes: 6 additions & 5 deletions trunk/arch/arm/mach-omap2/prcm-common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,13 +243,14 @@
#define OMAP24XX_EN_GPT1_MASK (1 << 0)

/* PM_WKST_WKUP, CM_IDLEST_WKUP shared bits */
#define OMAP24XX_ST_GPIOS_SHIFT (1 << 2)
#define OMAP24XX_ST_GPIOS_MASK 2
#define OMAP24XX_ST_GPT1_SHIFT (1 << 0)
#define OMAP24XX_ST_GPT1_MASK 0
#define OMAP24XX_ST_GPIOS_SHIFT 2
#define OMAP24XX_ST_GPIOS_MASK (1 << 2)
#define OMAP24XX_ST_GPT1_SHIFT 0
#define OMAP24XX_ST_GPT1_MASK (1 << 0)

/* CM_IDLEST_MDM and PM_WKST_MDM shared bits */
#define OMAP2430_ST_MDM_SHIFT (1 << 0)
#define OMAP2430_ST_MDM_SHIFT 0
#define OMAP2430_ST_MDM_MASK (1 << 0)


/* 3430 register bits shared between CM & PRM registers */
Expand Down

0 comments on commit d7a088c

Please sign in to comment.