diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-10 07:16:33 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-10 07:16:33 -0500 |
| commit | 7ff485c68b7e5573e5a4a877066e98398283a24f (patch) | |
| tree | 8070ad8de0b18240ee67e1c8b847afc37bdb2d5d /board/ti/am335x/mux.c | |
| parent | 7504e9e75f76a5101b47cd32851ad7bd4ea8ff70 (diff) | |
| parent | 19f8c4dfb6e744a31da59bdd23b24d144152f1dc (diff) | |
| download | u-boot-7ff485c68b7e5573e5a4a877066e98398283a24f.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
- DM_I2C_COMPAT removal for all ti platforms from Jean-Jacques Hiblot
- Fix in i2c command help output from Chirstoph Muellner.
Diffstat (limited to 'board/ti/am335x/mux.c')
| -rw-r--r-- | board/ti/am335x/mux.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c index 41333f93f4..04f4b8e693 100644 --- a/board/ti/am335x/mux.c +++ b/board/ti/am335x/mux.c @@ -329,12 +329,23 @@ static unsigned short detect_daughter_board_profile(void) { unsigned short val; +#ifndef CONFIG_DM_I2C if (i2c_probe(I2C_CPLD_ADDR)) return PROFILE_NONE; if (i2c_read(I2C_CPLD_ADDR, CFG_REG, 1, (unsigned char *)(&val), 2)) return PROFILE_NONE; +#else + struct udevice *dev = NULL; + int rc; + rc = i2c_get_chip_for_busnum(0, I2C_CPLD_ADDR, 1, &dev); + if (rc) + return PROFILE_NONE; + rc = dm_i2c_read(dev, CFG_REG, (unsigned char *)(&val), 2); + if (rc) + return PROFILE_NONE; +#endif return (1 << (val & PROFILE_MASK)); } |