X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=post%2Fdrivers%2Fi2c.c;h=95da2ebdaf528b191bb4c2d83235d4381779869e;hb=495c3a1e2242b2c52c8088c52768db5b53592e85;hp=0cbbf77bb37138562f2cd63714331cb6e85a7a42;hpb=7e263cea88995d0b4b9fb659a95c382128feca71;p=u-boot

diff --git a/post/drivers/i2c.c b/post/drivers/i2c.c
index 0cbbf77bb3..95da2ebdaf 100644
--- a/post/drivers/i2c.c
+++ b/post/drivers/i2c.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2002
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
@@ -26,10 +10,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,22 +28,43 @@
 
 #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 ret  = 0;
 	int j;
-	const unsigned char i2c_addr_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;
 
@@ -75,6 +84,8 @@ int i2c_post_test (int flags)
 	for (i = 0; i < sizeof(i2c_addr_list); ++i) {
 		if (i2c_addr_list[i] == 0xff)
 			continue;
+		if (i2c_ignore_device(i2c_addr_list[i]))
+			continue;
 		post_log("I2C: addr %02x did not respond\n", i2c_addr_list[i]);
 		ret = -1;
 	}