[U-Boot,v2,4/8] ti: common: board_detect: Set alen to expected value before i2c read

Submitted by Cooper Jr., Franklin on April 20, 2017, 3:25 p.m.

Details

Message ID 20170420152549.28031-5-fcooper@ti.com
State New
Delegated to: Heiko Schocher
Headers show

Commit Message

Cooper Jr., Franklin April 20, 2017, 3:25 p.m.
In non DM I2C read operations the address length passed in during a read
operation will be used automatically. However, in DM I2C the address length
is set to a default value of one which causes problems when trying to
perform a read with a differing alen. Therefore, before the first read in a
series of read operations set the alen to the correct value.

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
 board/ti/common/board_detect.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

Comments

Heiko Schocher April 28, 2017, 4 a.m.
Hello Franklin,

Am 20.04.2017 um 17:25 schrieb Franklin S Cooper Jr:
> In non DM I2C read operations the address length passed in during a read
> operation will be used automatically. However, in DM I2C the address length
> is set to a default value of one which causes problems when trying to
> perform a read with a differing alen. Therefore, before the first read in a
> series of read operations set the alen to the correct value.
>
> Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>   board/ti/common/board_detect.c | 24 ++++++++++++++++++++++--
>   1 file changed, 22 insertions(+), 2 deletions(-)

Reviewed-by: Heiko Schocher <hs@denx.de>

Applied to u-boot-i2c/next

bye,
Heiko
>
> diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
> index 1e695f4..6fdcb61 100644
> --- a/board/ti/common/board_detect.c
> +++ b/board/ti/common/board_detect.c
> @@ -83,7 +83,17 @@ static int __maybe_unused ti_i2c_eeprom_init(int i2c_bus, int dev_addr)
>   static int __maybe_unused ti_i2c_eeprom_read(int dev_addr, int offset,
>   					     uchar *ep, int epsize)
>   {
> -	return i2c_read(dev_addr, offset, 2, ep, epsize);
> +	int bus_num, rc, alen;
> +
> +	bus_num = i2c_get_bus_num();
> +
> +	alen = 2;
> +
> +	rc = ti_i2c_set_alen(bus_num, dev_addr, alen);
> +	if (rc)
> +		return rc;
> +
> +	return i2c_read(dev_addr, offset, alen, ep, epsize);
>   }
>
>   /**
> @@ -125,6 +135,11 @@ static int __maybe_unused ti_i2c_eeprom_get(int bus_addr, int dev_addr,
>   	 * Read the header first then only read the other contents.
>   	 */
>   	byte = 2;
> +
> +	rc = ti_i2c_set_alen(bus_addr, dev_addr, byte);
> +	if (rc)
> +		return rc;
> +
>   	rc = i2c_read(dev_addr, 0x0, byte, (uint8_t *)&hdr_read, 4);
>   	if (rc)
>   		return rc;
> @@ -137,9 +152,14 @@ static int __maybe_unused ti_i2c_eeprom_get(int bus_addr, int dev_addr,
>   		 * 1 byte address (some legacy boards need this..)
>   		 */
>   		byte = 1;
> -		if (rc)
> +		if (rc) {
> +			rc = ti_i2c_set_alen(bus_addr, dev_addr, byte);
> +			if (rc)
> +				return rc;
> +
>   			rc = i2c_read(dev_addr, 0x0, byte, (uint8_t *)&hdr_read,
>   				      4);
> +		}
>   		if (rc)
>   			return rc;
>   	}
>

Patch hide | download patch | download mbox

diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
index 1e695f4..6fdcb61 100644
--- a/board/ti/common/board_detect.c
+++ b/board/ti/common/board_detect.c
@@ -83,7 +83,17 @@  static int __maybe_unused ti_i2c_eeprom_init(int i2c_bus, int dev_addr)
 static int __maybe_unused ti_i2c_eeprom_read(int dev_addr, int offset,
 					     uchar *ep, int epsize)
 {
-	return i2c_read(dev_addr, offset, 2, ep, epsize);
+	int bus_num, rc, alen;
+
+	bus_num = i2c_get_bus_num();
+
+	alen = 2;
+
+	rc = ti_i2c_set_alen(bus_num, dev_addr, alen);
+	if (rc)
+		return rc;
+
+	return i2c_read(dev_addr, offset, alen, ep, epsize);
 }
 
 /**
@@ -125,6 +135,11 @@  static int __maybe_unused ti_i2c_eeprom_get(int bus_addr, int dev_addr,
 	 * Read the header first then only read the other contents.
 	 */
 	byte = 2;
+
+	rc = ti_i2c_set_alen(bus_addr, dev_addr, byte);
+	if (rc)
+		return rc;
+
 	rc = i2c_read(dev_addr, 0x0, byte, (uint8_t *)&hdr_read, 4);
 	if (rc)
 		return rc;
@@ -137,9 +152,14 @@  static int __maybe_unused ti_i2c_eeprom_get(int bus_addr, int dev_addr,
 		 * 1 byte address (some legacy boards need this..)
 		 */
 		byte = 1;
-		if (rc)
+		if (rc) {
+			rc = ti_i2c_set_alen(bus_addr, dev_addr, byte);
+			if (rc)
+				return rc;
+
 			rc = i2c_read(dev_addr, 0x0, byte, (uint8_t *)&hdr_read,
 				      4);
+		}
 		if (rc)
 			return rc;
 	}