aboutsummaryrefslogtreecommitdiff
path: root/drivers/i2c/mvtwsi.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2020-12-16 21:20:15 -0700
committerSimon Glass <sjg@chromium.org>2020-12-18 20:32:21 -0700
commit16df99324663fd3f88cb5e1ce241ee3f9f9ddacd (patch)
tree7f07261d469a4e588ef182be3b12a9817d010e5c /drivers/i2c/mvtwsi.c
parent5c5800225501dc18eff71ecf4e5e45d0309f40ca (diff)
downloadu-boot-16df99324663fd3f88cb5e1ce241ee3f9f9ddacd.zip
u-boot-16df99324663fd3f88cb5e1ce241ee3f9f9ddacd.tar.gz
u-boot-16df99324663fd3f88cb5e1ce241ee3f9f9ddacd.tar.bz2
i2c: Update for new sequence numbers
Use the new sequence number in all cases. Drop the logic to check for a valid number in designware_i2c, since it will always be valid. Also drop the numbering in the uclass, since we can rely on driver model giving us the right sequence numbers. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/i2c/mvtwsi.c')
-rw-r--r--drivers/i2c/mvtwsi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index 1fcb8c6..a4d59b6 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -823,9 +823,9 @@ static int mvtwsi_i2c_bind(struct udevice *bus)
struct mvtwsi_registers *twsi = dev_read_addr_ptr(bus);
/* Disable the hidden slave in i2c0 of these platforms */
- if ((IS_ENABLED(CONFIG_ARMADA_38X) || IS_ENABLED(CONFIG_ARCH_KIRKWOOD)
- || IS_ENABLED(CONFIG_ARMADA_8K))
- && bus->req_seq == 0)
+ if ((IS_ENABLED(CONFIG_ARMADA_38X) ||
+ IS_ENABLED(CONFIG_ARCH_KIRKWOOD) ||
+ IS_ENABLED(CONFIG_ARMADA_8K)) && !dev_seq(bus))
twsi_disable_i2c_slave(twsi);
return 0;