Blackfin: unify default I2C settings for ADI boards

Signed-off-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Heiko Schocher <hs@denx.de>
2010-06-08 16:18:00 -04:00 · 2010-06-08 16:18:00 -04:00 · 787e343b91
parent bbf4fbb6cc
commit 787e343b91
18 changed files with 12 additions and 34 deletions
--- a/include/configs/bf518f-ezbrd.h
+++ b/include/configs/bf518f-ezbrd.h
@ -137,8 +137,6 @@
 */
 #define CONFIG_BFIN_TWI_I2C	1
 #define CONFIG_HARD_I2C		1
-#define CONFIG_SYS_I2C_SPEED	50000
-#define CONFIG_SYS_I2C_SLAVE	0


 /*
--- a/include/configs/bf526-ezbrd.h
+++ b/include/configs/bf526-ezbrd.h
@ -134,8 +134,6 @@
 */
 #define CONFIG_BFIN_TWI_I2C	1
 #define CONFIG_HARD_I2C		1
-#define CONFIG_SYS_I2C_SPEED	50000
-#define CONFIG_SYS_I2C_SLAVE	0


 /*
--- a/include/configs/bf527-ezkit.h
+++ b/include/configs/bf527-ezkit.h
@ -138,8 +138,6 @@
 */
 #define CONFIG_BFIN_TWI_I2C	1
 #define CONFIG_HARD_I2C		1
-#define CONFIG_SYS_I2C_SPEED	50000
-#define CONFIG_SYS_I2C_SLAVE	0


 /*
--- a/include/configs/bf533-ezkit.h
+++ b/include/configs/bf533-ezkit.h
@ -136,8 +136,6 @@
 	} while (0)
 #define I2C_DELAY		udelay(5)	/* 1/4 I2C clock duration */

-#define CONFIG_SYS_I2C_SPEED		50000
-#define CONFIG_SYS_I2C_SLAVE		0
 #endif


--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@ -180,8 +180,6 @@
 	} while (0)
 #define I2C_DELAY		udelay(5)	/* 1/4 I2C clock duration */

-#define CONFIG_SYS_I2C_SPEED		50000
-#define CONFIG_SYS_I2C_SLAVE		0
 #endif


--- a/include/configs/bf537-pnav.h
+++ b/include/configs/bf537-pnav.h
@ -155,8 +155,6 @@
 */
 #define CONFIG_BFIN_TWI_I2C	1
 #define CONFIG_HARD_I2C		1
-#define CONFIG_SYS_I2C_SPEED		50000
-#define CONFIG_SYS_I2C_SLAVE		0


 /*
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@ -137,8 +137,6 @@
 */
 #define CONFIG_BFIN_TWI_I2C	1
 #define CONFIG_HARD_I2C		1
-#define CONFIG_SYS_I2C_SPEED	50000
-#define CONFIG_SYS_I2C_SLAVE	0


 /*
--- a/include/configs/bf538f-ezkit.h
+++ b/include/configs/bf538f-ezkit.h
@ -134,8 +134,6 @@
 */
 #define CONFIG_BFIN_TWI_I2C	1
 #define CONFIG_HARD_I2C		1
-#define CONFIG_SYS_I2C_SPEED	50000
-#define CONFIG_SYS_I2C_SLAVE	0


 /*
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@ -140,8 +140,6 @@
 */
 #define CONFIG_BFIN_TWI_I2C	1
 #define CONFIG_HARD_I2C		1
-#define CONFIG_SYS_I2C_SPEED	50000
-#define CONFIG_SYS_I2C_SLAVE	0


 /*
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@ -151,8 +151,6 @@
 	} while (0)
 #define I2C_DELAY		udelay(5)	/* 1/4 I2C clock duration */

-#define CONFIG_SYS_I2C_SPEED		50000
-#define CONFIG_SYS_I2C_SLAVE		0
 #endif


--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@ -251,6 +251,18 @@
 # define CONFIG_NET_RETRY_COUNT 20
 #endif

+/*
+ * I2C Settings
+ */
+#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
+# ifndef CONFIG_SYS_I2C_SPEED
+#  define CONFIG_SYS_I2C_SPEED 50000
+# endif
+# ifndef CONFIG_SYS_I2C_SLAVE
+#  define CONFIG_SYS_I2C_SLAVE 0
+# endif
+#endif
+
 /*
 * Misc Settings
 */
--- a/include/configs/cm-bf527.h
+++ b/include/configs/cm-bf527.h
@ -117,8 +117,6 @@
 */
 #define CONFIG_BFIN_TWI_I2C	1
 #define CONFIG_HARD_I2C		1
-#define CONFIG_SYS_I2C_SPEED	50000
-#define CONFIG_SYS_I2C_SLAVE	0


 /*
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@ -119,8 +119,6 @@
 */
 #define CONFIG_BFIN_TWI_I2C	1
 #define CONFIG_HARD_I2C		1
-#define CONFIG_SYS_I2C_SPEED	50000
-#define CONFIG_SYS_I2C_SLAVE	0


 /*
--- a/include/configs/cm-bf537u.h
+++ b/include/configs/cm-bf537u.h
@ -120,8 +120,6 @@
 */
 #define CONFIG_BFIN_TWI_I2C	1
 #define CONFIG_HARD_I2C		1
-#define CONFIG_SYS_I2C_SPEED	50000
-#define CONFIG_SYS_I2C_SLAVE	0


 /*
--- a/include/configs/cm-bf548.h
+++ b/include/configs/cm-bf548.h
@ -107,8 +107,6 @@
 */
 #define CONFIG_BFIN_TWI_I2C	1
 #define CONFIG_HARD_I2C		1
-#define CONFIG_SYS_I2C_SPEED	50000
-#define CONFIG_SYS_I2C_SLAVE	0


 /*
--- a/include/configs/ibf-dsp561.h
+++ b/include/configs/ibf-dsp561.h
@ -138,8 +138,6 @@
 	} while (0)
 #define I2C_DELAY		udelay(5)	/* 1/4 I2C clock duration */

-#define CONFIG_SYS_I2C_SPEED	50000
-#define CONFIG_SYS_I2C_SLAVE	0
 #endif


--- a/include/configs/tcm-bf518.h
+++ b/include/configs/tcm-bf518.h
@ -106,8 +106,6 @@
 */
 #define CONFIG_BFIN_TWI_I2C	1
 #define CONFIG_HARD_I2C		1
-#define CONFIG_SYS_I2C_SPEED	50000
-#define CONFIG_SYS_I2C_SLAVE	0


 /*
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@ -120,8 +120,6 @@
 */
 #define CONFIG_BFIN_TWI_I2C	1
 #define CONFIG_HARD_I2C		1
-#define CONFIG_SYS_I2C_SPEED	50000
-#define CONFIG_SYS_I2C_SLAVE	0


 /*