minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 12:13:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-i2c

Browse Source
This commit is contained in:
Wolfgang Denk 2011-04-28 23:19:18 +02:00
commit 34d9cb5ec6
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/cmd_i2c.c
View File

@ -132,6 +132,14 @@ DECLARE_GLOBAL_DATA_PTR;
#define DISP_LINE_LEN 16 #define DISP_LINE_LEN 16
/* implement possible board specific board init */
void __def_i2c_init_board(void)
{
return;
}
void i2c_init_board(void)
__attribute__((weak, alias("__def_i2c_init_board")));
/* TODO: Implement architecture-specific get/set functions */ /* TODO: Implement architecture-specific get/set functions */
unsigned int __def_i2c_get_bus_speed(void) unsigned int __def_i2c_get_bus_speed(void)
{ {
@ -1541,6 +1549,8 @@ int i2x_mux_select_mux(int bus)
mux = dev->mux; mux = dev->mux;
while (mux != NULL) { while (mux != NULL) {
/* do deblocking on each level of mux, before mux config */
i2c_init_board();
if (i2c_write(mux->chip, 0, 0, &mux->channel, 1) != 0) { if (i2c_write(mux->chip, 0, 0, &mux->channel, 1) != 0) {
printf ("Error setting Mux: chip:%x channel: \ printf ("Error setting Mux: chip:%x channel: \
%x\n", mux->chip, mux->channel); %x\n", mux->chip, mux->channel);
@ -1548,6 +1558,8 @@ int i2x_mux_select_mux(int bus)
} }
mux = mux->next; mux = mux->next;
} }
/* do deblocking on each level of mux and after mux config */
i2c_init_board();
return 0; return 0;
} }
#endif /* CONFIG_I2C_MUX */ #endif /* CONFIG_I2C_MUX */

1
drivers/i2c/soft_i2c.c
View File

@ -286,6 +286,7 @@ int i2c_set_bus_num(unsigned int bus)
int ret; int ret;
ret = i2x_mux_select_mux(bus); ret = i2x_mux_select_mux(bus);
i2c_init_board();
if (ret == 0) if (ret == 0)
i2c_bus_num = bus; i2c_bus_num = bus;
else else

2
include/i2c.h
View File

@ -108,9 +108,7 @@
* repeatedly to change the speed and slave addresses. * repeatedly to change the speed and slave addresses.
*/ */
void i2c_init(int speed, int slaveaddr); void i2c_init(int speed, int slaveaddr);
#ifdef CONFIG_SYS_I2C_INIT_BOARD
void i2c_init_board(void); void i2c_init_board(void);
#endif
#ifdef CONFIG_SYS_I2C_BOARD_LATE_INIT #ifdef CONFIG_SYS_I2C_BOARD_LATE_INIT
void i2c_board_late_init(void); void i2c_board_late_init(void);
#endif #endif