diff options
| author | Tom Rini <trini@ti.com> | 2013-08-20 11:34:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-08-20 11:34:24 -0400 |
| commit | 63980c296aad0708f486d9229394b9000c874a90 (patch) | |
| tree | cf04c10cab0ca6786529b62ee0a4f3f82089d301 /board/samsung/trats/trats.c | |
| parent | 39bc12ddc36c9e30199471da0f3a929b178a04b2 (diff) | |
| parent | 3fbb517f30fe68e29640bee63ab366569914d898 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'board/samsung/trats/trats.c')
| -rw-r--r-- | board/samsung/trats/trats.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c index c8698f30df..7f61d17abb 100644 --- a/board/samsung/trats/trats.c +++ b/board/samsung/trats/trats.c @@ -61,10 +61,10 @@ void i2c_init_board(void) struct exynos4_gpio_part2 *gpio2 = (struct exynos4_gpio_part2 *)samsung_get_base_gpio_part2(); - /* I2C_5 -> PMIC */ + /* I2C_5 -> PMIC -> Adapter 0 */ s5p_gpio_direction_output(&gpio1->b, 7, 1); s5p_gpio_direction_output(&gpio1->b, 6, 1); - /* I2C_9 -> FG */ + /* I2C_9 -> FG -> Adapter 1 */ s5p_gpio_direction_output(&gpio2->y4, 0, 1); s5p_gpio_direction_output(&gpio2->y4, 1, 1); } @@ -282,10 +282,17 @@ int power_init_board(void) struct power_battery *pb; struct pmic *p_fg, *p_chrg, *p_muic, *p_bat; - ret = pmic_init(I2C_5); + /* + * For PMIC/MUIC the I2C bus is named as I2C5, but it is connected + * to logical I2C adapter 0 + * + * The FUEL_GAUGE is marked as I2C9 on the schematic, but connected + * to logical I2C adapter 1 + */ + ret = pmic_init(I2C_0); ret |= pmic_init_max8997(); - ret |= power_fg_init(I2C_9); - ret |= power_muic_init(I2C_5); + ret |= power_fg_init(I2C_1); + ret |= power_muic_init(I2C_0); ret |= power_bat_init(0); if (ret) return ret; |