diff options
author | Tom Rini <trini@konsulko.com> | 2017-08-10 07:22:59 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-08-10 07:22:59 -0400 |
commit | b24065c4ef21687787a74eef22dfa9232096f965 (patch) | |
tree | b6fcc2d1e4f2bad093c1cc335e0523847026f4aa /board | |
parent | 4edc31c5931b22e06f33a33d9a8f30cc3248cf1e (diff) | |
parent | 014e47f028526689aaa8ecb2e9164572937afe44 (diff) | |
download | u-boot-b24065c4ef21687787a74eef22dfa9232096f965.tar.gz u-boot-b24065c4ef21687787a74eef22dfa9232096f965.tar.bz2 u-boot-b24065c4ef21687787a74eef22dfa9232096f965.zip |
Merge git://git.denx.de/u-boot-i2c
Diffstat (limited to 'board')
-rw-r--r-- | board/compulab/cm_t35/cm_t35.c | 2 | ||||
-rw-r--r-- | board/logicpd/am3517evm/am3517evm.c | 2 | ||||
-rw-r--r-- | board/ti/am3517crane/am3517crane.c | 2 | ||||
-rw-r--r-- | board/ti/evm/evm.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c index f1691257e7..da6709889a 100644 --- a/board/compulab/cm_t35/cm_t35.c +++ b/board/compulab/cm_t35/cm_t35.c @@ -398,7 +398,7 @@ void board_mmc_power_init(void) } #endif -#ifdef CONFIG_SYS_I2C_OMAP34XX +#ifdef CONFIG_SYS_I2C_OMAP24XX /* * Routine: reset_net_chip * Description: reset the Ethernet controller via TPS65930 GPIO diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c index 5d2d997e42..c18a5a3140 100644 --- a/board/logicpd/am3517evm/am3517evm.c +++ b/board/logicpd/am3517evm/am3517evm.c @@ -105,7 +105,7 @@ int misc_init_r(void) volatile unsigned int ctr; u32 reset; -#ifdef CONFIG_SYS_I2C_OMAP34XX +#ifdef CONFIG_SYS_I2C_OMAP24XX i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE); #endif diff --git a/board/ti/am3517crane/am3517crane.c b/board/ti/am3517crane/am3517crane.c index 5fa319d615..136cc43884 100644 --- a/board/ti/am3517crane/am3517crane.c +++ b/board/ti/am3517crane/am3517crane.c @@ -43,7 +43,7 @@ int board_init(void) */ int misc_init_r(void) { -#ifdef CONFIG_SYS_I2C_OMAP34XX +#ifdef CONFIG_SYS_I2C_OMAP24XX i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE); #endif diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c index fe8e79312f..a6c5a3d8e1 100644 --- a/board/ti/evm/evm.c +++ b/board/ti/evm/evm.c @@ -147,7 +147,7 @@ void get_board_mem_timings(struct board_sdrc_timings *timings) int misc_init_r(void) { -#ifdef CONFIG_SYS_I2C_OMAP34XX +#ifdef CONFIG_SYS_I2C_OMAP24XX i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE); #endif |