Merge git://git.denx.de/u-boot-i2c
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user