From 0e5990e9c6fa0ab0cf178d5f0d080057c5dbf946 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 25 Jul 2013 15:58:42 +0200 Subject: [PATCH] zynq: Synchronize configuration with mainline - I2C Signed-off-by: Michal Simek --- include/configs/zynq_common.h | 6 +++--- include/configs/zynq_zc70x.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h index 57f0b1fa129..2e1a421f0c3 100644 --- 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 37c48066d91..2c492760ba8 100644 --- 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 -- 2.47.3