summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-08-06 09:49:06 -0400
committerTom Rini <trini@ti.com>2013-08-06 09:49:06 -0400
commitd05bfd0586ccebe96e31976459c8ef45ec65e109 (patch)
tree808c63a3e901985b87909dc4a7c9b7a7e20ba608
parentf53932addd3169839834829937a3cd7ae912f7ac (diff)
parent90f002a90f5ac9087737fbc9e781f3519e011f28 (diff)
downloadu-boot-imx-d05bfd0586ccebe96e31976459c8ef45ec65e109.zip
u-boot-imx-d05bfd0586ccebe96e31976459c8ef45ec65e109.tar.gz
u-boot-imx-d05bfd0586ccebe96e31976459c8ef45ec65e109.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-i2c
-rw-r--r--drivers/i2c/soft_i2c.c8
-rw-r--r--include/configs/blackstamp.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c
index a2baec0..396fea8 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 7d82275..5b3aac7 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
/*