diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-02-11 22:05:13 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-02-11 22:05:13 +0100 |
| commit | 6e4c1da86e77576476b566977305ddd82f9e6b8c (patch) | |
| tree | 9aae79ccdf1c55f7999dbd71f5dd137c263266f8 /arch/arm/include/asm/arch-am33xx/cpu.h | |
| parent | b75190debab35f3a138774d0d41595493574d112 (diff) | |
| parent | b4116ede36da628a517a94d6cba9dba4a02104a4 (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
* 'master' of /home/wd/git/u-boot/custodians:
ARM: AM33XX: Add i2c support
ARM: AM33XX: Add AM33XX I2C driver support
ARM: I2C: I2C Multi byte address support
Diffstat (limited to 'arch/arm/include/asm/arch-am33xx/cpu.h')
| -rw-r--r-- | arch/arm/include/asm/arch-am33xx/cpu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-am33xx/cpu.h b/arch/arm/include/asm/arch-am33xx/cpu.h index 25558a2b2c..cd002e632d 100644 --- a/arch/arm/include/asm/arch-am33xx/cpu.h +++ b/arch/arm/include/asm/arch-am33xx/cpu.h @@ -95,7 +95,8 @@ struct cm_wkuppll { unsigned int divm2dpllper; /* offset 0xAC */ unsigned int resv11[1]; unsigned int wkup_uart0ctrl; /* offset 0xB4 */ - unsigned int resv12[8]; + unsigned int wkup_i2c0ctrl; /* offset 0xB8 */ + unsigned int resv12[7]; unsigned int divm6dpllcore; /* offset 0xD8 */ }; |