diff options
| author | Tom Rini <trini@konsulko.com> | 2022-03-23 09:10:34 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-03-23 09:10:34 -0400 |
| commit | 5bc486286f4f54d9f399adaa560720d4bf9f6566 (patch) | |
| tree | 23c2e67a3c2a0068a0879e1669d02da5adc476df /cmd/eeprom.c | |
| parent | 3789b6a92fe958174da8d045c1f5d39822eaba7d (diff) | |
| parent | fc1383ae2b5ca69e51bee68e4047589a5ee7b386 (diff) | |
Merge tag 'i2c-2022-04-rc5' of https://source.denx.de/u-boot/custodians/u-boot-i2c
i2c changes for fixes-for-2022.04
- atsha204a-i2c.c
DTS and I2C fixes for Atmel ATSHA204 from Adrian
- i2c: fix always-true condition in i2c_probe_chip()
from Nikita
- eeprom: Do not rewrite EEPROM I2C bus with DM I2C enabled
from Marek
- clarify bootcount documentation fix from Michael
Diffstat (limited to 'cmd/eeprom.c')
| -rw-r--r-- | cmd/eeprom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/eeprom.c b/cmd/eeprom.c index cdd65af763b..fc0d4440694 100644 --- a/cmd/eeprom.c +++ b/cmd/eeprom.c @@ -149,7 +149,7 @@ static int eeprom_rw(unsigned dev_addr, unsigned offset, uchar *buffer, int rcode = 0; uchar addr[3]; -#if defined(CONFIG_SYS_I2C_EEPROM_BUS) +#if !CONFIG_IS_ENABLED(DM_I2C) && defined(CONFIG_SYS_I2C_EEPROM_BUS) eeprom_init(CONFIG_SYS_I2C_EEPROM_BUS); #endif |