X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fi2c.h;h=b75476980bf2292cdc01658f4821f18c5687084e;hb=6e20e64f5c6deb5b48e40a0cba4877f9170545e0;hp=f8a59a6699cad4e2afdc3f1e9267d38406f06771;hpb=f8eab9c3e15db68d20cad8e257da228b518cde85;p=oweals%2Fu-boot.git

diff --git a/include/i2c.h b/include/i2c.h
index f8a59a6699..b75476980b 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -47,7 +47,9 @@
 #define I2C_RXTX_LEN	128	/* maximum tx/rx buffer length */
 
 #if defined(CONFIG_I2C_MULTI_BUS)
+#if !defined(CONFIG_SYS_MAX_I2C_BUS)
 #define CONFIG_SYS_MAX_I2C_BUS		2
+#endif
 #define I2C_GET_BUS()		i2c_get_bus_num()
 #define I2C_SET_BUS(a)		i2c_set_bus_num(a)
 #else
@@ -78,16 +80,22 @@
 #endif
 
 #ifdef CONFIG_8xx
-/* Set default values for the I2C bus speed and slave address on 8xx. In the
+/* Set default value for the I2C bus speed on 8xx. In the
  * future, we'll define these in all 8xx board config files.
  */
 #ifndef	CONFIG_SYS_I2C_SPEED
 #define	CONFIG_SYS_I2C_SPEED	50000
 #endif
+#endif
 
+/*
+ * Many boards/controllers/drivers don't support an I2C slave interface so
+ * provide a default slave address for them for use in common code.  A real
+ * value for CONFIG_SYS_I2C_SLAVE should be defined for any board which does
+ * support a slave interface.
+ */
 #ifndef	CONFIG_SYS_I2C_SLAVE
-#define	CONFIG_SYS_I2C_SLAVE	0xFE
-#endif
+#define	CONFIG_SYS_I2C_SLAVE	0xfe
 #endif
 
 /*