diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-05-28 15:44:54 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-05-28 15:44:54 -0700 |
| commit | 970a724d9173526512ebd8be991a4cbe18b7aace (patch) | |
| tree | 7541c2b34e82ccabb068bdae530936838a71fad8 /arch/arm/plat-omap | |
| parent | c81592ba1b012d555d0cb7ec711afda89c327469 (diff) | |
| parent | 4a899d5e93fd974952492cd4a09e98b209d1ad58 (diff) | |
Merge branch 'omap3-upstream' into for-next
Conflicts:
arch/arm/mach-omap2/serial.c
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/keypad.h | 4 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/mach/omap34xx.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/include/mach/keypad.h b/arch/arm/plat-omap/include/mach/keypad.h index 232923aaf61..45ea3ae3c99 100644 --- a/arch/arm/plat-omap/include/mach/keypad.h +++ b/arch/arm/plat-omap/include/mach/keypad.h @@ -33,7 +33,11 @@ struct omap_kp_platform_data { #define GROUP_3 (3 << 16) #define GROUP_MASK GROUP_3 +#define KEY_PERSISTENT 0x00800000 +#define KEYNUM_MASK 0x00EFFFFF #define KEY(col, row, val) (((col) << 28) | ((row) << 24) | (val)) +#define PERSISTENT_KEY(col, row) (((col) << 28) | ((row) << 24) | \ + KEY_PERSISTENT) #endif diff --git a/arch/arm/plat-omap/include/mach/omap34xx.h b/arch/arm/plat-omap/include/mach/omap34xx.h index cc2573330dc..f8d186a7371 100644 --- a/arch/arm/plat-omap/include/mach/omap34xx.h +++ b/arch/arm/plat-omap/include/mach/omap34xx.h @@ -31,13 +31,9 @@ #define L4_34XX_BASE 0x48000000 #define L4_WK_34XX_BASE 0x48300000 -#define L4_WK_OMAP_BASE L4_WK_34XX_BASE #define L4_PER_34XX_BASE 0x49000000 -#define L4_PER_OMAP_BASE L4_PER_34XX_BASE #define L4_EMU_34XX_BASE 0x54000000 -#define L4_EMU_BASE L4_EMU_34XX_BASE #define L3_34XX_BASE 0x68000000 -#define L3_OMAP_BASE L3_34XX_BASE #define OMAP3430_32KSYNCT_BASE 0x48320000 #define OMAP3430_CM_BASE 0x48004800 |