diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-30 16:44:54 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-08-30 16:56:54 -0400 |
| commit | a85a8e63c5cf8ccb3905eb5982bf8bdcb2978557 (patch) | |
| tree | b9feab308105519bdac26729cee734ef49bb62f2 /drivers/i2c/s3c24x0_i2c.c | |
| parent | 9b0583a839ab8b086b65b4762769abbe048a524d (diff) | |
| parent | 809c4f242f6c05f67a097ace0098c5bc1dfebdfb (diff) | |
Merge branch '2021-08-30-kconfig-migrations-part1' into next
- Begin merging some Kconfig migration, and CONFIG namespace cleanup
series in. This gives us:
- A number of I2C symbols migrated over
- DWC2, i8042, altera_spi and a few other areas updated to use CFG not
CONFIG for the concept of "configuration space" defines.
- Rename CONFIG_EXTRA_ENV_BOARD_SETTINGS to EXTRA_ENV_BOARD_SETTINGS
- Some dead code removal.
- Rename a number of CONFIG symbols that were only referenced within
the config header to not use CONFIG as a prefix.
Diffstat (limited to 'drivers/i2c/s3c24x0_i2c.c')
| -rw-r--r-- | drivers/i2c/s3c24x0_i2c.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c index 56f0f69885e..e0f499d759f 100644 --- a/drivers/i2c/s3c24x0_i2c.c +++ b/drivers/i2c/s3c24x0_i2c.c @@ -21,12 +21,6 @@ #include <i2c.h> #include "s3c24x0_i2c.h" -#ifndef CONFIG_SYS_I2C_S3C24X0_SLAVE -#define SYS_I2C_S3C24X0_SLAVE_ADDR 0 -#else -#define SYS_I2C_S3C24X0_SLAVE_ADDR CONFIG_SYS_I2C_S3C24X0_SLAVE -#endif - DECLARE_GLOBAL_DATA_PTR; /* @@ -83,6 +77,8 @@ static void i2c_ch_init(struct s3c24x0_i2c *i2c, int speed, int slaveadd) writel(I2C_MODE_MT | I2C_TXRX_ENA, &i2c->iicstat); } +#define SYS_I2C_S3C24X0_SLAVE_ADDR 0 + static int s3c24x0_i2c_set_bus_speed(struct udevice *dev, unsigned int speed) { struct s3c24x0_i2c_bus *i2c_bus = dev_get_priv(dev); |