From bb32c2a617673ff14970399e5519de0400614baf Mon Sep 17 00:00:00 2001 From: Tim Harvey Date: Mon, 8 Mar 2021 13:52:35 -0800 Subject: [PATCH] board: gateworks: venice: fix gsc_get_dev use dm_i2c_probe instead of i2c_get_chip which appears to be more reliable. Signed-off-by: Tim Harvey Reviewed-by: Fabio Estevam --- board/gateworks/venice/gsc.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/board/gateworks/venice/gsc.c b/board/gateworks/venice/gsc.c index ad3f8d95d9..d2490e6063 100644 --- a/board/gateworks/venice/gsc.c +++ b/board/gateworks/venice/gsc.c @@ -125,29 +125,18 @@ enum { static struct udevice *gsc_get_dev(int busno, int slave) { - struct udevice *dev; + static const char * const i2c[] = { "i2c@30a20000", "i2c@30a30000" }; + struct udevice *dev, *bus; int ret; -#if (IS_ENABLED(CONFIG_SPL_BUILD)) - ret = i2c_get_chip_for_busnum(busno + 1, slave, 1, &dev); - if (ret) - return NULL; -#else - struct udevice *bus; - - busno--; - - ret = uclass_get_device_by_seq(UCLASS_I2C, busno, &bus); + ret = uclass_get_device_by_name(UCLASS_I2C, i2c[busno - 1], &bus); if (ret) { - printf("i2c%d: no bus %d\n", busno + 1, ret); + printf("GSC : failed I2C%d probe: %d\n", busno, ret); return NULL; } - ret = i2c_get_chip(bus, slave, 1, &dev); - if (ret) { - printf("i2c%d@0x%02x: no chip %d\n", busno + 1, slave, ret); + ret = dm_i2c_probe(bus, slave, 0, &dev); + if (ret) return NULL; - } -#endif return dev; } -- 2.39.5