diff options
| author | Marek Vasut <marex@denx.de> | 2013-08-01 12:32:20 +0200 |
|---|---|---|
| committer | Heiko Schocher <hs@denx.de> | 2013-08-03 06:01:18 +0200 |
| commit | 90f002a90f5ac9087737fbc9e781f3519e011f28 (patch) | |
| tree | bf8c2e8f39d4a3f3cb31fb08cbef20691dd3af18 | |
| parent | 245d65b6e503f3a159cffb3392ac3b2c25606d8e (diff) | |
| download | olio-uboot-2014.01-90f002a90f5ac9087737fbc9e781f3519e011f28.tar.xz olio-uboot-2014.01-90f002a90f5ac9087737fbc9e781f3519e011f28.zip | |
i2c: soft: Fix typo in CONFIG_SYS_I2C_SOFT_SPEED
In case only the CONFIG_SYS_I2C_SPEED is set in configuration file,
the CONFIG_SYS_I2C_SOFT_SPEED is defined as CONFIG_SYS_I2C_SPEED.
The CONFIG_SYS_I2C_SOFT_SPEED is then used throughout the driver.
Unfortunatelly, due to a typo in the driver, instead of defining
CONFIG_SYS_I2C_SOFT_SPEED, an CONFIG_SYS_SOFT_I2C_SPEED was defined
and therefore the driver failed to compile. The same applies for
CONFIG_SYS_I2C_SOFT_SLAVE , where the swap happens as well.
This patch fixes the issue.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Heiko Schocher <hs@denx.de>
| -rw-r--r-- | drivers/i2c/soft_i2c.c | 8 | ||||
| -rw-r--r-- | include/configs/blackstamp.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c index a2baec0ac..396fea89a 100644 --- a/drivers/i2c/soft_i2c.c +++ b/drivers/i2c/soft_i2c.c @@ -105,11 +105,11 @@ DECLARE_GLOBAL_DATA_PTR; # endif #endif -#if !defined(CONFIG_SYS_SOFT_I2C_SPEED) -#define CONFIG_SYS_SOFT_I2C_SPEED CONFIG_SYS_I2C_SPEED +#if !defined(CONFIG_SYS_I2C_SOFT_SPEED) +#define CONFIG_SYS_I2C_SOFT_SPEED CONFIG_SYS_I2C_SPEED #endif -#if !defined(CONFIG_SYS_SOFT_I2C_SLAVE) -#define CONFIG_SYS_SOFT_I2C_SLAVE CONFIG_SYS_I2C_SLAVE +#if !defined(CONFIG_SYS_I2C_SOFT_SLAVE) +#define CONFIG_SYS_I2C_SOFT_SLAVE CONFIG_SYS_I2C_SLAVE #endif /*----------------------------------------------------------------------- diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h index 7d8227503..5b3aac795 100644 --- a/include/configs/blackstamp.h +++ b/include/configs/blackstamp.h @@ -206,8 +206,8 @@ #ifdef CONFIG_SYS_I2C_SOFT #define CONFIG_SOFT_I2C_GPIO_SCL GPIO_PF9 #define CONFIG_SOFT_I2C_GPIO_SDA GPIO_PF8 -#define CONFIG_SYS_SOFT_I2C_SPEED 50000 -#define CONFIG_SYS_SOFT_I2C_SLAVE 0xFE +#define CONFIG_SYS_I2C_SOFT_SPEED 50000 +#define CONFIG_SYS_I2C_SOFT_SLAVE 0xFE #endif /* |