diff options
author | Tom Rini <trini@ti.com> | 2014-05-09 11:18:45 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-05-09 11:18:45 -0400 |
commit | bcb879c0e37db1cf527ff408df93918f155012ea (patch) | |
tree | c092b7e27e69b3c419b6cd238768ceb73f793644 /include/configs/cam_enc_4xx.h | |
parent | 146b468eb0203c9b1aa1de93723ffc82c85d1dc1 (diff) | |
parent | d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19 (diff) | |
download | u-boot-bcb879c0e37db1cf527ff408df93918f155012ea.tar.gz |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/cam_enc_4xx.h')
-rw-r--r-- | include/configs/cam_enc_4xx.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h index 8182a7577b..d1a8ff2a82 100644 --- a/include/configs/cam_enc_4xx.h +++ b/include/configs/cam_enc_4xx.h @@ -57,10 +57,10 @@ #define CONFIG_RESET_PHY_R /* I2C */ -#define CONFIG_HARD_I2C -#define CONFIG_DRIVER_DAVINCI_I2C -#define CONFIG_SYS_I2C_SPEED 400000 -#define CONFIG_SYS_I2C_SLAVE 0x10 /* SMBus host address */ +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_DAVINCI +#define CONFIG_SYS_DAVINCI_I2C_SPEED 400000 +#define CONFIG_SYS_DAVINCI_I2C_SLAVE 0x10 /* SMBus host address */ /* NAND: socketed, two chipselects, normally 2 GBytes */ #define CONFIG_NAND_DAVINCI |