zynq: Synchronize configuration with mainline - I2C

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h
index 57f0b1fa1299e0f541b063dd2cf54726a373d6bb..2e1a421f0c3eef8f171d865002b5eee598c4e549 100644 (file)
--- a/include/configs/zynq_common.h
+++ b/include/configs/zynq_common.h
@@ -170,10 +170,10 @@
 #endif
 
 /* I2C */
-#ifdef CONFIG_ZYNQ_I2C
+#if defined(CONFIG_ZYNQ_I2C0) || defined(CONFIG_ZYNQ_I2C1)
 # define CONFIG_CMD_I2C
-# define CONFIG_ZYNQ_I2C0
-# define CONFIG_HARD_I2C               1
+# define CONFIG_ZYNQ_I2C
+# define CONFIG_HARD_I2C
 # define CONFIG_SYS_I2C_SPEED          100000
 # define CONFIG_SYS_I2C_SLAVE          1
 #endif

diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index 37c48066d91c68728bafdf98857d8fc426084086..2c492760ba8081aff2e2109e4d74ab0087c697e7 100644 (file)
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@@ -28,7 +28,7 @@
 
 #define CONFIG_ZYNQ_SDHCI0
 #define CONFIG_ZYNQ_QSPI
-#define CONFIG_ZYNQ_I2C
+#define CONFIG_ZYNQ_I2C0
 #define CONFIG_ZYNQ_EEPROM
 
 #include <configs/zynq_common.h>