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 tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-dove
/
include
/
mach
/
bridge-regs.h
diff --git
a/arch/arm/mach-dove/include/mach/bridge-regs.h
b/arch/arm/mach-dove/include/mach/bridge-regs.h
index
5362df3
..
f4a5b34
100644
(file)
--- a/
arch/arm/mach-dove/include/mach/bridge-regs.h
+++ b/
arch/arm/mach-dove/include/mach/bridge-regs.h
@@
-21,6
+21,7
@@
#define CPU_CTRL_PCIE1_LINK 0x00000008
#define RSTOUTn_MASK (BRIDGE_VIRT_BASE + 0x0108)
+#define RSTOUTn_MASK_PHYS (BRIDGE_PHYS_BASE + 0x0108)
#define SOFT_RESET_OUT_EN 0x00000004
#define SYSTEM_SOFT_RESET (BRIDGE_VIRT_BASE + 0x010c)