post, i2c: add missing curly bracket in i2c_post_test

[karo-tx-uboot.git] / post / drivers / i2c.c

diff --git a/post/drivers/i2c.c b/post/drivers/i2c.c
index 84a603549d42e4a71449e982b7086cd0f40043bb..4cbd9f3703f8f2b9f47cf9ad0626a2dbdbf281dc 100644 (file)
--- a/post/drivers/i2c.c
+++ b/post/drivers/i2c.c
@@ -26,10 +26,14 @@
  *
  * For verifying the I2C bus, a full I2C bus scanning is performed.
  *
- * #ifdef I2C_ADDR_LIST
- *   The test is considered as passed if all the devices and
- *   only the devices in the list are found.
- * #else [ ! I2C_ADDR_LIST ]
+ * #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.
+ *   #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,49 +44,67 @@
 
 #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 I2C_ADDR_LIST
-       for (i = 0; i < 128; 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;
+       }
 
        /* No devices found */
        return -1;
 #else
-       unsigned int good = 0;
-       unsigned int bad  = 0;
+       unsigned int ret  = 0;
        int j;
-       unsigned char i2c_addr_list[] = I2C_ADDR_LIST;
-       unsigned char i2c_miss_list[] = I2C_ADDR_LIST;
+       unsigned char i2c_addr_list[] = CONFIG_SYS_POST_I2C_ADDRS;
 
-       for (i = 0; i < 128; i++) {
+       /* 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;
+
                for (j = 0; j < sizeof(i2c_addr_list); ++j) {
                        if (i == i2c_addr_list[j]) {
-                               good++;
-                               i2c_miss_list[j] = 0xFF;
+                               i2c_addr_list[j] = 0xff;
                                break;
                        }
                }
 
                if (j == sizeof(i2c_addr_list)) {
-                       bad++;
-                       post_log("I2C: addr %02X not expected\n", i);
+                       ret = -1;
+                       post_log("I2C: addr %02x not expected\n", i);
                }
        }
 
-       if (good != sizeof(i2c_addr_list)) {
-               for (j = 0; j < sizeof(i2c_miss_list); ++j) {
-                       if (i2c_miss_list[j] != 0xFF) {
-                               post_log("I2C: addr %02X did not respond\n",
-                                               i2c_miss_list[j]);
-                       }
-               }
+       for (i = 0; i < sizeof(i2c_addr_list); ++i) {
+               if (i2c_addr_list[i] == 0xff)
+                       continue;
+               post_log("I2C: addr %02x did not respond\n", i2c_addr_list[i]);
+               ret = -1;
        }
-       return ((good == sizeof(i2c_addr_list)) && (bad == 0)) ? 0 : -1;
+
+       return ret;
 #endif
 }