diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
| commit | 0b9b01517f0b1398ec27dbb47faf3645b719e02c (patch) | |
| tree | fac11441ba4056e75d3b59811da3b0a91d1cfcf5 /drivers/i2c/octeon_i2c.c | |
| parent | 8bd3c0a7e17ee17c771cabc0e548a1a436ac021d (diff) | |
| parent | 6333acb961b6fcaa60c6e5b623d676b332481cfa (diff) | |
Merge branch '2023-01-20-finish-CONFIG-migration-work'
- Merge in the final batch of CONFIG to Kconfig/CFG migration work. This
includes a fix for a number of ns16550 or similar UARTs due to a
migration bug. We also pull in a revert for enabling CONFIG_VIDEO on
tools-only_defconfig.
Diffstat (limited to 'drivers/i2c/octeon_i2c.c')
| -rw-r--r-- | drivers/i2c/octeon_i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/octeon_i2c.c b/drivers/i2c/octeon_i2c.c index e54ef18e515..f2dea5626cb 100644 --- a/drivers/i2c/octeon_i2c.c +++ b/drivers/i2c/octeon_i2c.c @@ -146,7 +146,7 @@ enum { TWSI_STAT_IDLE = 0xf8 }; -#define CONFIG_SYS_I2C_OCTEON_SLAVE_ADDR 0x77 +#define CFG_SYS_I2C_OCTEON_SLAVE_ADDR 0x77 enum { PROBE_PCI = 0, /* PCI based probing */ @@ -800,7 +800,7 @@ static int octeon_i2c_probe(struct udevice *dev) twsi->base += twsi->data->reg_offs; i2c_slave_addr = dev_read_u32_default(dev, "i2c-sda-hold-time-ns", - CONFIG_SYS_I2C_OCTEON_SLAVE_ADDR); + CFG_SYS_I2C_OCTEON_SLAVE_ADDR); ret = clk_get_by_index(dev, 0, &twsi->clk); if (ret < 0) |