diff options
| author | Trevor Woerner <twoerner@gmail.com> | 2020-05-06 15:02:40 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-15 21:47:35 +0300 |
| commit | bb0fb4c0f40803eaffd7a4fc0ec3a9fe4a8be0f0 (patch) | |
| tree | 8882d7c32fd24fa1ff2765873caafa713c4d5215 /drivers/i2c | |
| parent | b48f72a86b3758e05227fa1fc607ea2c0c365f93 (diff) | |
| download | u-boot-bb0fb4c0f40803eaffd7a4fc0ec3a9fe4a8be0f0.tar.xz | |
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 <judge.packham@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/mvtwsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c index 77fe35a42b..d4b2031249 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 <asm/arch/orion5x.h> -#elif (defined(CONFIG_KIRKWOOD) || defined(CONFIG_ARCH_MVEBU)) +#elif (defined(CONFIG_ARCH_KIRKWOOD) || defined(CONFIG_ARCH_MVEBU)) #include <asm/arch/soc.h> #elif defined(CONFIG_ARCH_SUNXI) #include <asm/arch/i2c.h> @@ -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); |