diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-26 08:29:30 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-26 08:29:30 -0400 |
| commit | c3c9fd31bad80ead1682de917e27fa6073eae02b (patch) | |
| tree | 4cb097f843fb0ab60160035c67799a753fc7c13e /arch/arm/include/asm | |
| parent | c482c60a14e5fa44a62e13bab4d07c52c37915dc (diff) | |
| parent | 6e677caf8cf0cc1a2310f2e4e9f27b81c674bc95 (diff) | |
| download | u-boot-imx-c3c9fd31bad80ead1682de917e27fa6073eae02b.zip u-boot-imx-c3c9fd31bad80ead1682de917e27fa6073eae02b.tar.gz u-boot-imx-c3c9fd31bad80ead1682de917e27fa6073eae02b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/arch-omap4/i2c.h | 6 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-omap5/i2c.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/include/asm/arch-omap4/i2c.h b/arch/arm/include/asm/arch-omap4/i2c.h index adc8eb2..463e979 100644 --- a/arch/arm/include/asm/arch-omap4/i2c.h +++ b/arch/arm/include/asm/arch-omap4/i2c.h @@ -14,9 +14,9 @@ struct i2c { unsigned short revnb_lo; /* 0x00 */ unsigned short res1; unsigned short revnb_hi; /* 0x04 */ - unsigned short res2[13]; - unsigned short sysc; /* 0x20 */ - unsigned short res3; + unsigned short res2[5]; + unsigned short sysc; /* 0x10 */ + unsigned short res3[9]; unsigned short irqstatus_raw; /* 0x24 */ unsigned short res4; unsigned short stat; /* 0x28 */ diff --git a/arch/arm/include/asm/arch-omap5/i2c.h b/arch/arm/include/asm/arch-omap5/i2c.h index d875cfe..2b55edf 100644 --- a/arch/arm/include/asm/arch-omap5/i2c.h +++ b/arch/arm/include/asm/arch-omap5/i2c.h @@ -14,9 +14,9 @@ struct i2c { unsigned short revnb_lo; /* 0x00 */ unsigned short res1; unsigned short revnb_hi; /* 0x04 */ - unsigned short res2[13]; - unsigned short sysc; /* 0x20 */ - unsigned short res3; + unsigned short res2[5]; + unsigned short sysc; /* 0x10 */ + unsigned short res3[9]; unsigned short irqstatus_raw; /* 0x24 */ unsigned short res4; unsigned short stat; /* 0x28 */ |