projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-samsung
[platform/kernel/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
arch-omap3
/
omap.h
diff --git
a/arch/arm/include/asm/arch-omap3/omap.h
b/arch/arm/include/asm/arch-omap3/omap.h
index
91d73c2
..
8933f54
100644
(file)
--- a/
arch/arm/include/asm/arch-omap3/omap.h
+++ b/
arch/arm/include/asm/arch-omap3/omap.h
@@
-91,6
+91,9
@@
struct s32ktimer {
unsigned int s32k_cr; /* 0x10 */
};
unsigned int s32k_cr; /* 0x10 */
};
+#define DEVICE_TYPE_SHIFT 0x8
+#define DEVICE_TYPE_MASK (0x7 << DEVICE_TYPE_SHIFT)
+
#endif /* __ASSEMBLY__ */
#ifndef __ASSEMBLY__
#endif /* __ASSEMBLY__ */
#ifndef __ASSEMBLY__
@@
-243,6
+246,7
@@
struct gpio {
* ROM code API related flags
*/
#define OMAP3_GP_ROMCODE_API_L2_INVAL 1
* ROM code API related flags
*/
#define OMAP3_GP_ROMCODE_API_L2_INVAL 1
+#define OMAP3_GP_ROMCODE_API_WRITE_L2ACR 2
#define OMAP3_GP_ROMCODE_API_WRITE_ACR 3
/*
#define OMAP3_GP_ROMCODE_API_WRITE_ACR 3
/*