diff mbox

[U-Boot,v2,3/4] i2c: fti2c010: serial out r/w address in MSB order

Message ID 1385606826-2540-4-git-send-email-dantesu@gmail.com
State Superseded
Delegated to: Heiko Schocher
Headers show

Commit Message

Kuo-Jung Su Nov. 28, 2013, 2:47 a.m. UTC 
From: Kuo-Jung Su <dantesu@faraday-tech.com>

For a eeprom with a 2-bytes address (e.g., Ateml AT24C1024B),
the r/w address should be serial out in MSB order.

Signed-off-by: Kuo-Jung Su <dantesu@faraday-tech.com>
Cc: Heiko Schocher <hs@denx.de>
---
 Changes for v2:
  - Initial release

 drivers/i2c/fti2c010.c |   38 ++++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

--
1.7.9.5
diff mbox

Patch

diff --git a/drivers/i2c/fti2c010.c b/drivers/i2c/fti2c010.c
index eccc1da..351fa38 100644
--- a/drivers/i2c/fti2c010.c
+++ b/drivers/i2c/fti2c010.c
@@ -179,6 +179,34 @@  static int fti2c010_probe(struct i2c_adapter *adap, u8 dev)
 	return ret;
 }

+static void addr_to_i2c_data(u8 *buf, uint32_t val, int len)
+{
+	if (!buf || len <= 0)
+		return;
+
+	/* MSB first */
+	switch (len) {
+	case 1:
+		buf[0] = (u8)(val & 0xff);
+		break;
+	case 2:
+		buf[0] = (u8)((val >> 8) & 0xff);
+		buf[1] = (u8)(val & 0xff);
+		break;
+	case 3:
+		buf[0] = (u8)((val >> 16) & 0xff);
+		buf[1] = (u8)((val >> 8) & 0xff);
+		buf[2] = (u8)(val & 0xff);
+		break;
+	default:
+		buf[0] = (u8)((val >> 24) & 0xff);
+		buf[1] = (u8)((val >> 16) & 0xff);
+		buf[2] = (u8)((val >> 8) & 0xff);
+		buf[3] = (u8)(val & 0xff);
+		break;
+	}
+}
+
 static int fti2c010_read(struct i2c_adapter *adap,
 			u8 dev, uint addr, int alen, uchar *buf, int len)
 {
@@ -187,10 +215,7 @@  static int fti2c010_read(struct i2c_adapter *adap,
 	int ret, pos;
 	uchar paddr[4];

-	paddr[0] = (addr >> 0)  & 0xFF;
-	paddr[1] = (addr >> 8)  & 0xFF;
-	paddr[2] = (addr >> 16) & 0xFF;
-	paddr[3] = (addr >> 24) & 0xFF;
+	addr_to_i2c_data(paddr, addr, alen);

 	/*
 	 * Phase A. Set register address
@@ -252,10 +277,7 @@  static int fti2c010_write(struct i2c_adapter *adap,
 	int ret, pos;
 	uchar paddr[4];

-	paddr[0] = (addr >> 0)  & 0xFF;
-	paddr[1] = (addr >> 8)  & 0xFF;
-	paddr[2] = (addr >> 16) & 0xFF;
-	paddr[3] = (addr >> 24) & 0xFF;
+	addr_to_i2c_data(paddr, addr, alen);

 	/*
 	 * Phase A. Set register address