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/lpc32xx_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/lpc32xx_i2c.c')
| -rw-r--r-- | drivers/i2c/lpc32xx_i2c.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/i2c/lpc32xx_i2c.c b/drivers/i2c/lpc32xx_i2c.c index 774129ad8e..496f4feec5 100644 --- a/drivers/i2c/lpc32xx_i2c.c +++ b/drivers/i2c/lpc32xx_i2c.c @@ -20,12 +20,12 @@ * Provide default speed and slave if target did not */ -#if !defined(CONFIG_SYS_I2C_LPC32XX_SPEED) -#define CONFIG_SYS_I2C_LPC32XX_SPEED 350000 +#if !defined(CFG_SYS_I2C_LPC32XX_SPEED) +#define CFG_SYS_I2C_LPC32XX_SPEED 350000 #endif -#if !defined(CONFIG_SYS_I2C_LPC32XX_SLAVE) -#define CONFIG_SYS_I2C_LPC32XX_SLAVE 0 +#if !defined(CFG_SYS_I2C_LPC32XX_SLAVE) +#define CFG_SYS_I2C_LPC32XX_SLAVE 0 #endif /* TX register fields */ @@ -260,15 +260,15 @@ static unsigned int lpc32xx_i2c_set_bus_speed(struct i2c_adapter *adap, U_BOOT_I2C_ADAP_COMPLETE(lpc32xx_0, lpc32xx_i2c_init, lpc32xx_i2c_probe_chip, lpc32xx_i2c_read, lpc32xx_i2c_write, lpc32xx_i2c_set_bus_speed, - CONFIG_SYS_I2C_LPC32XX_SPEED, - CONFIG_SYS_I2C_LPC32XX_SLAVE, + CFG_SYS_I2C_LPC32XX_SPEED, + CFG_SYS_I2C_LPC32XX_SLAVE, 0) U_BOOT_I2C_ADAP_COMPLETE(lpc32xx_1, lpc32xx_i2c_init, lpc32xx_i2c_probe_chip, lpc32xx_i2c_read, lpc32xx_i2c_write, lpc32xx_i2c_set_bus_speed, - CONFIG_SYS_I2C_LPC32XX_SPEED, - CONFIG_SYS_I2C_LPC32XX_SLAVE, + CFG_SYS_I2C_LPC32XX_SPEED, + CFG_SYS_I2C_LPC32XX_SLAVE, 1) U_BOOT_I2C_ADAP_COMPLETE(lpc32xx_2, lpc32xx_i2c_init, NULL, |