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-arm
[platform/kernel/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
arch-pantheon
/
cpu.h
diff --git
a/arch/arm/include/asm/arch-pantheon/cpu.h
b/arch/arm/include/asm/arch-pantheon/cpu.h
index
30f4393
..
60955c5
100644
(file)
--- a/
arch/arm/include/asm/arch-pantheon/cpu.h
+++ b/
arch/arm/include/asm/arch-pantheon/cpu.h
@@
-50,7
+50,9
@@
struct panthapb_registers {
u32 uart0; /*0x000*/
u32 uart1; /*0x004*/
u32 gpio; /*0x008*/
- u8 pad0[0x034 - 0x08 - 4];
+ u8 pad0[0x02c - 0x08 - 4];
+ u32 twsi; /*0x02c*/
+ u8 pad1[0x034 - 0x2c - 4];
u32 timers; /*0x034*/
};