[U-Boot] [PATCH 18/18] armv8: ls2080ardb: enable I2C DM and EEPROM DM

[ying.zhang22455 at nxp.com]

From: Zhang Ying-22455 <ying.zhang22455 at nxp.com>

Some CONFIG options that are not supported on SPL must be
disabled because one .config is shared between SPL and U-Boot
proper going forward.

Such as CONFIG_I2C_DM is not supported in SPL at this time,
so we can only add a option CONFIG_I2C_DM in the image without
SPL.

After supporting the option CONFIG_SPL_I2C_DM in the future,
we can enable CONFIG_I2C_DM in all the image.

Signed-off-by: Zhang Ying-22455 <ying.zhang22455 at nxp.com>
---
 configs/ls2080ardb_SECURE_BOOT_defconfig | 3 +++
 configs/ls2080ardb_defconfig             | 3 +++
 configs/ls2081ardb_defconfig             | 3 +++
 include/configs/ls2080a_common.h         | 2 --
 include/configs/ls2080aqds.h             | 2 ++
 include/configs/ls2080ardb.h             | 8 ++++++++
 6 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/configs/ls2080ardb_SECURE_BOOT_defconfig b/configs/ls2080ardb_SECURE_BOOT_defconfig
index f258e63..0f43ca0 100644
--- a/configs/ls2080ardb_SECURE_BOOT_defconfig
+++ b/configs/ls2080ardb_SECURE_BOOT_defconfig
@@ -55,3 +55,6 @@ CONFIG_RSA_SOFTWARE_EXP=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
 CONFIG_DM_GPIO=y
 CONFIG_MPC8XXX_GPIO=y
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
+CONFIG_DM_EEPROM=y
diff --git a/configs/ls2080ardb_defconfig b/configs/ls2080ardb_defconfig
index 7d6844e..4fd792d 100644
--- a/configs/ls2080ardb_defconfig
+++ b/configs/ls2080ardb_defconfig
@@ -54,3 +54,6 @@ CONFIG_USB_STORAGE=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
 CONFIG_DM_GPIO=y
 CONFIG_MPC8XXX_GPIO=y
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
+CONFIG_DM_EEPROM=y
diff --git a/configs/ls2081ardb_defconfig b/configs/ls2081ardb_defconfig
index 2ac938e..2d10feb 100644
--- a/configs/ls2081ardb_defconfig
+++ b/configs/ls2081ardb_defconfig
@@ -54,3 +54,6 @@ CONFIG_USB_STORAGE=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
 CONFIG_DM_GPIO=y
 CONFIG_MPC8XXX_GPIO=y
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
+CONFIG_DM_EEPROM=y
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index 5024f97..6fd8271 100644
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -73,8 +73,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 2048 * 1024)
 
-/* I2C */
-#define CONFIG_SYS_I2C
 
 /* Serial Port */
 #define CONFIG_SYS_NS16550_SERIAL
diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 81a092b..e8953a6 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -318,6 +318,8 @@ unsigned long get_board_ddr_clk(void);
 	QIXIS_SDID_MASK) != QIXIS_ESDHC_NO_ADAPTER)
 #endif
 
+#define CONFIG_SYS_I2C
+
 /*
  * RTC configuration
  */
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 84c6b7b..35d34e4 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -292,6 +292,7 @@ unsigned long get_board_sys_clk(void);
  * RTC configuration
  */
 #define RTC
+#define CONFIG_SYS_RTC_BUS_NUM		0
 #ifdef CONFIG_TARGET_LS2081ARDB
 #define CONFIG_RTC_PCF8563		1
 #define CONFIG_SYS_I2C_RTC_ADDR         0x51
@@ -300,6 +301,10 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_SYS_I2C_RTC_ADDR         0x68
 #endif
 
+#if defined(CONFIG_NAND_BOOT) || defined(CONFIG_FSL_QSPI)
+#define CONFIG_SYS_I2C
+#endif
+
 /* EEPROM */
 #define CONFIG_ID_EEPROM
 #define CONFIG_SYS_I2C_EEPROM_NXID
@@ -308,6 +313,9 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	1
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
+#define FSL_I2C_EEPROM_DM_NAME			"i2c at 2000000"
+#define CONFIG_I2C_SET_DEFAULT_BUS_NUM
+#define CONFIG_I2C_DEFAULT_BUS_NUMBER		0
 
 #define CONFIG_FSL_MEMAC
 
-- 
2.7.4