Skip to content
Snippets Groups Projects
Commit 4bba9d3f authored by Simon Glass's avatar Simon Glass
Browse files

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: default avatarSimon Glass <sjg@chromium.org>
parent 6fb9ac15
No related branches found
No related tags found
No related merge requests found
...@@ -3,3 +3,5 @@ CONFIG_ARCH_EXYNOS=y ...@@ -3,3 +3,5 @@ CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_ODROID=y CONFIG_TARGET_ODROID=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid" CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
CONFIG_DM_I2C=y
CONFIG_DM_I2C_COMPAT=y
...@@ -13,6 +13,15 @@ config DM_I2C ...@@ -13,6 +13,15 @@ config DM_I2C
enabled together (it is not possible to use driver model enabled together (it is not possible to use driver model
for one and not the other). 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 config SYS_I2C_UNIPHIER
bool "UniPhier I2C driver" bool "UniPhier I2C driver"
depends on ARCH_UNIPHIER && DM_I2C depends on ARCH_UNIPHIER && DM_I2C
......
...@@ -126,6 +126,8 @@ ...@@ -126,6 +126,8 @@
#define SPI_FLASH_UBOOT_POS (CONFIG_SEC_FW_SIZE + CONFIG_BL1_SIZE) #define SPI_FLASH_UBOOT_POS (CONFIG_SEC_FW_SIZE + CONFIG_BL1_SIZE)
/* I2C */ /* I2C */
/* TODO(sjg@chromium.org): Move these two options to Kconfig */
#define CONFIG_DM_I2C #define CONFIG_DM_I2C
#define CONFIG_DM_I2C_COMPAT #define CONFIG_DM_I2C_COMPAT
#define CONFIG_CMD_I2C #define CONFIG_CMD_I2C
......
...@@ -177,8 +177,6 @@ ...@@ -177,8 +177,6 @@
/* I2C */ /* I2C */
#define CONFIG_CMD_I2C #define CONFIG_CMD_I2C
#define CONFIG_DM_I2C
#define CONFIG_DM_I2C_COMPAT
#define CONFIG_SYS_I2C_S3C24X0 #define CONFIG_SYS_I2C_S3C24X0
#define CONFIG_SYS_I2C_S3C24X0_SPEED 100000 #define CONFIG_SYS_I2C_S3C24X0_SPEED 100000
#define CONFIG_SYS_I2C_S3C24X0_SLAVE 0 #define CONFIG_SYS_I2C_S3C24X0_SLAVE 0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment