With DM now enabled with the device tree pulled from Linux, we can enable DM_I2C in U-Boot.
Reviewed-by: Jagan Teki jagan@openedev.com Signed-off-by: Adam Ford aford173@gmail.com --- V3: No Change V2: New to series arch/arm/dts/da850-evm-u-boot.dtsi | 1 + configs/da850evm_defconfig | 3 +++ include/configs/da850evm.h | 5 +++-- 3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/arm/dts/da850-evm-u-boot.dtsi b/arch/arm/dts/da850-evm-u-boot.dtsi index 516bc1d..2041cde 100644 --- a/arch/arm/dts/da850-evm-u-boot.dtsi +++ b/arch/arm/dts/da850-evm-u-boot.dtsi @@ -13,6 +13,7 @@ }; aliases { + i2c0 = &i2c0; spi0 = &spi1; }; }; diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index 08cc2e8..d6cd1fa 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_ASKENV=y CONFIG_CRC32_VERIFY=y # CONFIG_CMD_FLASH is not set +CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y @@ -38,6 +39,8 @@ CONFIG_CMD_DIAG=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y +CONFIG_DM_I2C=y +CONFIG_I2C_SET_DEFAULT_BUS_NUM=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index a47ba96..38798b0 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -28,6 +28,7 @@ #undef CONFIG_DM_SPI #undef CONFIG_DM_SPI_FLASH #undef CONFIG_DM_I2C +#undef CONFIG_DM_I2C_COMPAT #endif /* * SoC Configuration @@ -178,10 +179,10 @@ /* * I2C Configuration */ +#ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_I2C_DAVINCI -#define CONFIG_SYS_DAVINCI_I2C_SPEED 25000 -#define CONFIG_SYS_DAVINCI_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */ #define CONFIG_SYS_I2C_EXPANDER_ADDR 0x20 +#endif
/* * Flash & Environment