From eff6b7731b03f3a387d83a2a5b7b78a3037e74b0 Mon Sep 17 00:00:00 2001 From: Mugunthan V N Date: Mon, 18 Jul 2016 15:10:59 +0530 Subject: ti_armv7_common: i2c: do not define DM_I2C for spl Since omap's spl doesn't support DM currently, do not define DM_I2C for spl build. Signed-off-by: Mugunthan V N Reviewed-by: Tom Rini --- include/configs/ti_armv7_common.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'include') diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index ba7cf15..b996f35 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -108,6 +108,14 @@ /* Timer information. */ #define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ +/* + * Disable DM_* for SPL build and can be re-enabled after adding + * DM support in SPL + */ +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_DM_I2C +#endif + /* I2C IP block */ #define CONFIG_I2C #define CONFIG_SYS_I2C -- cgit v1.1 From c50f2610b5cc672cd2ff6e160e5c9e99f1052c32 Mon Sep 17 00:00:00 2001 From: Mugunthan V N Date: Mon, 18 Jul 2016 15:11:02 +0530 Subject: defconfig: am335x_boneblack_vboot: enable i2c driver model Enable i2c driver model for am335x_boneblack_vboot as omap i2c supports driver model. Also enable CONFIG_DM_I2C_COMPAT for legacy drivers of i2c devices. Signed-off-by: Mugunthan V N Reviewed-by: Tom Rini --- include/configs/ti_armv7_common.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'include') diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index b996f35..9f947ee 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -118,7 +118,15 @@ /* I2C IP block */ #define CONFIG_I2C +#ifndef CONFIG_DM_I2C #define CONFIG_SYS_I2C +#else +/* + * Enable CONFIG_DM_I2C_COMPAT temporarily until all the i2c client + * devices are adopted to DM + */ +#define CONFIG_DM_I2C_COMPAT +#endif /* MMC/SD IP block */ #define CONFIG_MMC -- cgit v1.1