projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'u-boot/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
omap_common.h
diff --git
a/arch/arm/include/asm/omap_common.h
b/arch/arm/include/asm/omap_common.h
index 12c2207c275a2567c0702990d7b78da8224f06f4..5469435cc756e82af8839529bd20a9501a910b37 100644
(file)
--- a/
arch/arm/include/asm/omap_common.h
+++ b/
arch/arm/include/asm/omap_common.h
@@
-345,6
+345,10
@@
struct prcm_regs {
/* GMAC Clk Ctrl */
u32 cm_gmac_gmac_clkctrl;
u32 cm_gmac_clkstctrl;
+
+ /* IPU */
+ u32 cm_ipu_clkstctrl;
+ u32 cm_ipu_i2c5_clkctrl;
};
struct omap_sys_ctrl_regs {