From: Tom Rini <trini@konsulko.com>
Date: Tue, 8 Aug 2017 21:05:33 +0000 (-0400)
Subject: Merge git://www.denx.de/git/u-boot-marvell
X-Git-Tag: v2017.09-rc2~93
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f032ce23ac8e789b716645dc9fd8392787add20;hp=1989374b21089c63019fc9648408c8d609023ffe;p=platform%2Fkernel%2Fu-boot.git

Merge git://www.denx.de/git/u-boot-marvell
---

diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index 86926f8..a427509 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -90,7 +90,7 @@ static struct serdes_map board_serdes_map_sata[] = {
 static bool omnia_detect_sata(void)
 {
 	struct udevice *bus, *dev;
-	int ret;
+	int ret, retry = 3;
 	u16 mode;
 
 	puts("SERDES0 card detect: ");
@@ -106,8 +106,13 @@ static bool omnia_detect_sata(void)
 		return false;
 	}
 
-	ret = dm_i2c_read(dev, OMNIA_I2C_MCU_ADDR_STATUS, (uchar *) &mode, 2);
-	if (ret) {
+	for (; retry > 0; --retry) {
+		ret = dm_i2c_read(dev, OMNIA_I2C_MCU_ADDR_STATUS, (uchar *) &mode, 2);
+		if (!ret)
+			break;
+	}
+
+	if (!retry) {
 		puts("I2C read failed! Default PEX\n");
 		return false;
 	}