aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/README.POST8
-rw-r--r--post/drivers/i2c.c26
2 files changed, 32 insertions, 2 deletions
diff --git a/doc/README.POST b/doc/README.POST
index 695497e4b..6815d491c 100644
--- a/doc/README.POST
+++ b/doc/README.POST
@@ -665,6 +665,14 @@ listed in CONFIG_SYS_POST_I2C_ADDRS are found, and no additional
devices are detected. If CONFIG_SYS_POST_I2C_ADDRS is not defined
the test will pass if any I2C device is found.
+The CONFIG_SYS_POST_I2C_IGNORES define can be used to list I2C
+devices which may or may not be present when using
+CONFIG_SYS_POST_I2C_ADDRS. The I2C POST test will pass regardless
+if the devices in CONFIG_SYS_POST_I2C_IGNORES are found or not.
+This is useful in cases when I2C devices are optional (eg on a
+daughtercard that may or may not be present) or not critical
+to board operation.
+
2.2.2.2. Watchdog timer test
To test the watchdog timer the scheme mentioned above (refer to
diff --git a/post/drivers/i2c.c b/post/drivers/i2c.c
index e6f4c6a1f..3080e81b5 100644
--- a/post/drivers/i2c.c
+++ b/post/drivers/i2c.c
@@ -27,8 +27,12 @@
* For verifying the I2C bus, a full I2C bus scanning is performed.
*
* #ifdef CONFIG_SYS_POST_I2C_ADDRS
- * The test is considered as passed if all the devices and
- * only the devices in the list are found.
+ * The test is considered as passed if all the devices and only the devices
+ * in the list are found.
+ * #ifdef CONFIG_SYS_POST_I2C_IGNORES
+ * Ignore devices listed in CONFIG_SYS_POST_I2C_IGNORES. These devices
+ * are optional or not vital to board functionality.
+ * #endif
* #else [ ! CONFIG_SYS_POST_I2C_ADDRS ]
* The test is considered as passed if any I2C device is found.
* #endif
@@ -40,12 +44,28 @@
#if CONFIG_POST & CONFIG_SYS_POST_I2C
+static int i2c_ignore_device(unsigned int chip)
+{
+#ifdef CONFIG_SYS_POST_I2C_IGNORES
+ const unsigned char i2c_ignore_list[] = CONFIG_SYS_POST_I2C_IGNORES;
+ int i;
+
+ for (i = 0; i < sizeof(i2c_ignore_list); i++)
+ if (i2c_ignore_list[i] == chip)
+ return 1;
+#endif
+
+ return 0;
+}
+
int i2c_post_test (int flags)
{
unsigned int i;
#ifndef CONFIG_SYS_POST_I2C_ADDRS
/* Start at address 1, address 0 is the general call address */
for (i = 1; i < 128; i++)
+ if (i2c_ignore_device(i))
+ continue;
if (i2c_probe (i) == 0)
return 0;
@@ -58,6 +78,8 @@ int i2c_post_test (int flags)
/* Start at address 1, address 0 is the general call address */
for (i = 1; i < 128; i++) {
+ if (i2c_ignore_device(i))
+ continue;
if (i2c_probe(i) != 0)
continue;