summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-02-13 12:20:48 -0700
committerSimon Glass <sjg@chromium.org>2015-02-19 06:19:18 -0700
commit4bba9d3f77061ea742d8f697ce72251fb79c8016 (patch)
treeee4a330947f17eaa50740540986ac72891dfa881
parent6fb9ac15ebac4bcc4864be7958bf9b2b2b7420de (diff)
downloadu-boot-imx-4bba9d3f77061ea742d8f697ce72251fb79c8016.zip
u-boot-imx-4bba9d3f77061ea742d8f697ce72251fb79c8016.tar.gz
u-boot-imx-4bba9d3f77061ea742d8f697ce72251fb79c8016.tar.bz2
dm: Move CONFIG_I2C_COMPAT to Kconfig
Make this option available in Kconfig and clean up the board that uses it. Note there is also an entry in exynos5-common.h but this affects multiple boards and should be dropped as part of the Samsung I2C migration to driver model. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--configs/odroid_defconfig2
-rw-r--r--drivers/i2c/Kconfig9
-rw-r--r--include/configs/exynos5-common.h2
-rw-r--r--include/configs/odroid.h2
4 files changed, 13 insertions, 2 deletions
diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index a842837..816a3fa 100644
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_ODROID=y
CONFIG_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 2cc776c..692810d 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -13,6 +13,15 @@ config DM_I2C
enabled together (it is not possible to use driver model
for one and not the other).
+config DM_I2C_COMPAT
+ bool "Enable I2C compatibility layer"
+ depends on DM
+ help
+ Enable old-style I2C functions for compatibility with existing code.
+ This option can be enabled as a temporary measure to avoid needing
+ to convert all code for a board in a single commit. It should not
+ be enabled for any board in an official release.
+
config SYS_I2C_UNIPHIER
bool "UniPhier I2C driver"
depends on ARCH_UNIPHIER && DM_I2C
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index 0ba39a2..3ab8d55 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -126,6 +126,8 @@
#define SPI_FLASH_UBOOT_POS (CONFIG_SEC_FW_SIZE + CONFIG_BL1_SIZE)
/* I2C */
+
+/* TODO(sjg@chromium.org): Move these two options to Kconfig */
#define CONFIG_DM_I2C
#define CONFIG_DM_I2C_COMPAT
#define CONFIG_CMD_I2C
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 9d5dbdc..8b47537 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -177,8 +177,6 @@
/* I2C */
#define CONFIG_CMD_I2C
-#define CONFIG_DM_I2C
-#define CONFIG_DM_I2C_COMPAT
#define CONFIG_SYS_I2C_S3C24X0
#define CONFIG_SYS_I2C_S3C24X0_SPEED 100000
#define CONFIG_SYS_I2C_S3C24X0_SLAVE 0