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>

diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index a8428373acfe8b000d528f982ccb252836b22ed2..816a3fad3c9c3422340855c725abf29b6bf89567 100644 (file)
--- 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_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 2cc776c73f4b0886bf0b4ab60c0bb864396137bf..692810d057e4d3e57d6d570d0fa8271f7f6ca960 100644 (file)
--- 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).
 
          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
 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 0ba39a23dd03d4fcf71d3bed7815e8149cc7019d..3ab8d559bfd067bed55cb722bda118e4e4064cfc 100644 (file)
--- 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 */
 #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
 #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 9d5dbdce369381588f67a13e2e5cb44673d2dab4..8b47537614ecf7fd150fb0bd10fcb179d0eb4dee 100644 (file)
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -177,8 +177,6 @@
 
 /* I2C */
 #define CONFIG_CMD_I2C
 
 /* 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
 #define CONFIG_SYS_I2C_S3C24X0
 #define CONFIG_SYS_I2C_S3C24X0_SPEED   100000
 #define CONFIG_SYS_I2C_S3C24X0_SLAVE   0