summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2018-04-17 17:45:28 -0400
committerTom Rini <[email protected]>2018-04-17 17:45:28 -0400
commit40df6b3e1882c55dd34b9177a42e21a591d668ee (patch)
tree3d4e8246db0179c5c8356a47a845f3165ad74086 /include/configs
parentf4df1f767892b42d01e9213d08a6f16eef646152 (diff)
parentf369e1564cf4f81654b8a806fdc325b62b6627dc (diff)
Merge git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/socfpga_common.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index cf1f2b18866..025c7de2d13 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -137,6 +137,7 @@
/*
* I2C support
*/
+#ifndef CONFIG_DM_I2C
#define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_BASE SOCFPGA_I2C0_ADDRESS
#define CONFIG_SYS_I2C_BASE1 SOCFPGA_I2C1_ADDRESS
@@ -157,6 +158,7 @@
unsigned int cm_get_l4_sp_clk_hz(void);
#define IC_CLK (cm_get_l4_sp_clk_hz() / 1000000)
#endif
+#endif /* CONFIG_DM_I2C */
/*
* QSPI support