git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c64xx
/
include
/
mach
/
regs-sys.h
diff --git
a/arch/arm/mach-s3c64xx/include/mach/regs-sys.h
b/arch/arm/mach-s3c64xx/include/mach/regs-sys.h
index
69b78d9
..
b91e020
100644
(file)
--- a/
arch/arm/mach-s3c64xx/include/mach/regs-sys.h
+++ b/
arch/arm/mach-s3c64xx/include/mach/regs-sys.h
@@
-21,8
+21,11
@@
#define S3C64XX_AHB_CON1 S3C_SYSREG(0x104)
#define S3C64XX_AHB_CON2 S3C_SYSREG(0x108)
#define S3C64XX_AHB_CON1 S3C_SYSREG(0x104)
#define S3C64XX_AHB_CON2 S3C_SYSREG(0x108)
+#define S3C64XX_SDMA_SEL S3C_SYSREG(0x110)
+
#define S3C64XX_OTHERS S3C_SYSREG(0x900)
#define S3C64XX_OTHERS_USBMASK (1 << 16)
#define S3C64XX_OTHERS S3C_SYSREG(0x900)
#define S3C64XX_OTHERS_USBMASK (1 << 16)
+#define S3C64XX_OTHERS_SYNCMUXSEL (1 << 6)
#endif /* _PLAT_REGS_SYS_H */
#endif /* _PLAT_REGS_SYS_H */