aboutsummaryrefslogtreecommitdiff
path: root/drivers/i2c/davinci_i2c.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-02-21 11:17:07 -0500
committerTom Rini <trini@konsulko.com>2021-02-21 11:17:07 -0500
commitb732c8780c3f7b47b00bd59e5f6ad7d6ec099d68 (patch)
tree2e4d72720d9254f7ba8be5a981368d77d92f91dc /drivers/i2c/davinci_i2c.c
parent72993e8e03845f82c3ccf7c72f205c9afd8da6d6 (diff)
parent2147a16983d17bcb0438607aa7760494afc27014 (diff)
Merge tag 'for-v2021.04' of https://gitlab.denx.de/u-boot/custodians/u-boot-i2c
i2c changes for v2021.04 new feature: - Allow disabling driver model for I2C in SPL fixes: - i2c-gpio: Fix GPIO output - at91: fix crash when using 'i2c probe'
Diffstat (limited to 'drivers/i2c/davinci_i2c.c')
-rw-r--r--drivers/i2c/davinci_i2c.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/davinci_i2c.c b/drivers/i2c/davinci_i2c.c
index 7811abad80..a4abd25c39 100644
--- a/drivers/i2c/davinci_i2c.c
+++ b/drivers/i2c/davinci_i2c.c
@@ -21,7 +21,7 @@
#include <linux/delay.h>
#include "davinci_i2c.h"
-#ifdef CONFIG_DM_I2C
+#if CONFIG_IS_ENABLED(DM_I2C)
/* Information about i2c controller */
struct i2c_bus {
int id;
@@ -340,7 +340,7 @@ static int _davinci_i2c_probe_chip(struct i2c_regs *i2c_base, uint8_t chip)
return rc;
}
-#ifndef CONFIG_DM_I2C
+#if !CONFIG_IS_ENABLED(DM_I2C)
static struct i2c_regs *davinci_get_base(struct i2c_adapter *adap)
{
switch (adap->hwadapnr) {