From bb0fb4c0f40803eaffd7a4fc0ec3a9fe4a8be0f0 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Wed, 6 May 2020 08:02:40 -0400 Subject: rename symbol: CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD Have this symbol follow the pattern of all other such symbols. This patch also removes a TODO from the code. Reviewed-by: Chris Packham Signed-off-by: Trevor Woerner --- drivers/i2c/mvtwsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/i2c') diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c index 77fe35a42bd..d4b2031249f 100644 --- a/drivers/i2c/mvtwsi.c +++ b/drivers/i2c/mvtwsi.c @@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; #ifndef CONFIG_DM_I2C #if defined(CONFIG_ARCH_ORION5X) #include -#elif (defined(CONFIG_KIRKWOOD) || defined(CONFIG_ARCH_MVEBU)) +#elif (defined(CONFIG_ARCH_KIRKWOOD) || defined(CONFIG_ARCH_MVEBU)) #include #elif defined(CONFIG_ARCH_SUNXI) #include @@ -821,7 +821,7 @@ static int mvtwsi_i2c_bind(struct udevice *bus) struct mvtwsi_registers *twsi = devfdt_get_addr_ptr(bus); /* Disable the hidden slave in i2c0 of these platforms */ - if ((IS_ENABLED(CONFIG_ARMADA_38X) || IS_ENABLED(CONFIG_KIRKWOOD)) + if ((IS_ENABLED(CONFIG_ARMADA_38X) || IS_ENABLED(CONFIG_ARCH_KIRKWOOD)) && bus->req_seq == 0) twsi_disable_i2c_slave(twsi); -- cgit v1.3.1