ccxmx53: da9052-i2c, Check PMIC version before applying PMIC I2C workaround

Dialog is about to release samples of a new PMIC version which contains a
hardware fix for this issue.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>

1 files changed, 58 insertions, 70 deletions

diff --git a/drivers/mfd/da9052-i2c.c b/drivers/mfd/da9052-i2c.c
index 9371a3154b3a..856f482414b1 100644
--- a/drivers/mfd/da9052-i2c.c
+++ b/drivers/mfd/da9052-i2c.c
@@ -19,8 +19,6 @@ static struct da9052 *da9052_i2c;
 
 #define I2C_CONNECTED 0
 
-#define I2C_BUG_WORKAROUND
-
 static int da9052_i2c_is_connected(void)
 {
 	struct da9052_ssc_msg msg;
@@ -102,11 +100,9 @@ static int da9052_i2c_remove(struct i2c_client *client)
 	return 0;
 }
 
-#ifdef I2C_BUG_WORKAROUND
 #define I2C_DUMMY_REG	0xFF
 const unsigned char i2c_flush_data[] = {I2C_DUMMY_REG, 0xFF};
 
-#if 1	/* Enable safe register addresses checking */
 /* DLG TODO: Add read only registers here (they are not affected with write) */
 static inline int da9052_is_i2c_reg_safe(unsigned char reg)
 {
@@ -137,13 +133,6 @@ static inline int da9052_is_i2c_reg_safe(unsigned char reg)
 
 	return safe_table[reg];
 }
-#else
-static inline int da9052_is_i2c_reg_safe(unsigned char reg)
-{
-	return 0;
-}
-#endif
-#endif
 
 int da9052_i2c_write(struct da9052 *da9052, struct da9052_ssc_msg *msg)
 {
@@ -172,25 +161,24 @@ int da9052_i2c_write(struct da9052 *da9052, struct da9052_ssc_msg *msg)
 		return ret;
 	}
 
-#ifdef I2C_BUG_WORKAROUND
-	/* Test, whether register to be accessed needs to be flushed */
-	if (!da9052_is_i2c_reg_safe(msg->addr)) {
-		i2cmsg.addr = da9052->slave_addr;
-		i2cmsg.len = 2;
-		i2cmsg.flags = 0;		/* Write operation */
-		/* i2c_flush_data is only to read from */
-		i2cmsg.buf = (unsigned char *)i2c_flush_data;
-
-		/* Additional flush write */
-		ret = i2c_transfer(da9052->adapter, &i2cmsg, 1);
-		if (ret < 0) {
-			dev_info(&da9052->i2c_client->dev,\
-			"2 - %s:master_xfer Failed!!\n", __func__);
-			return ret;
+	if( da9052->chip_version <= DA9053_VERSION_BB ) {
+		/* Test, whether register to be accessed needs to be flushed */
+		if (!da9052_is_i2c_reg_safe(msg->addr)) {
+			i2cmsg.addr = da9052->slave_addr;
+			i2cmsg.len = 2;
+			i2cmsg.flags = 0;		/* Write operation */
+			/* i2c_flush_data is only to read from */
+			i2cmsg.buf = (unsigned char *)i2c_flush_data;
+
+			/* Additional flush write */
+			ret = i2c_transfer(da9052->adapter, &i2cmsg, 1);
+			if (ret < 0) {
+				dev_info(&da9052->i2c_client->dev,\
+				"2 - %s:master_xfer Failed!!\n", __func__);
+				return ret;
+			}
 		}
 	}
-#endif
-
 	return 0;
 }
 
@@ -230,19 +218,19 @@ int da9052_i2c_read(struct da9052 *da9052, struct da9052_ssc_msg *msg)
 		"2 - %s:master_xfer Failed!!\n", __func__);
 	}
 
-#ifdef I2C_BUG_WORKAROUND
-	/* Test, whether register to be accessed needs to be flushed */
-	if (!da9052_is_i2c_reg_safe(msg->addr)) {
-		i2cmsg[2].addr = da9052->slave_addr;
-		i2cmsg[2].len = 2;
-		i2cmsg[2].flags = 0;		/* Write operation */
-		/* i2c_flush_data is only to read from */
-		i2cmsg[2].buf = (unsigned char *)i2c_flush_data;
-
-		/* Read transfer with additional flush write */
-		ret = i2c_transfer(da9052->adapter, &i2cmsg[2], 1);
+	if( da9052->chip_version <= DA9053_VERSION_BB ) {
+		/* Test, whether register to be accessed needs to be flushed */
+		if (!da9052_is_i2c_reg_safe(msg->addr)) {
+			i2cmsg[2].addr = da9052->slave_addr;
+			i2cmsg[2].len = 2;
+			i2cmsg[2].flags = 0;		/* Write operation */
+			/* i2c_flush_data is only to read from */
+			i2cmsg[2].buf = (unsigned char *)i2c_flush_data;
+
+			/* Read transfer with additional flush write */
+			ret = i2c_transfer(da9052->adapter, &i2cmsg[2], 1);
+		}
 	}
-#endif
 
 	if (ret < 0) {
 		dev_info(&da9052->i2c_client->dev,\
@@ -333,23 +321,23 @@ int da9052_i2c_write_many(struct da9052 *da9052,
 		return ret;
 	}
 
-#ifdef I2C_BUG_WORKAROUND
-	/* Test, whether last register to be accessed needs to be flushed */
-	if (!da9052_is_i2c_reg_safe(sscmsg[msg_no-1].addr)) {
-		i2cmsg.addr  = da9052->slave_addr;
-		i2cmsg.len   = 2;
-		i2cmsg.flags = 0;	 /* Write operation */
-		/* i2c_flush_data is only to read from */
-		i2cmsg.buf   = (unsigned char *)i2c_flush_data;
-
-		ret = i2c_transfer(da9052->adapter, &i2cmsg, 1);
-		if (ret < 0) {
-			dev_info(&da9052->i2c_client->dev,
-				 "%s: i2c_transfer failed!!!\n", __func__);
-			return ret;
+	if( da9052->chip_version <= DA9053_VERSION_BB ) {
+		/* Test, whether last register to be accessed needs to be flushed */
+		if (!da9052_is_i2c_reg_safe(sscmsg[msg_no-1].addr)) {
+			i2cmsg.addr  = da9052->slave_addr;
+			i2cmsg.len   = 2;
+			i2cmsg.flags = 0;	 /* Write operation */
+			/* i2c_flush_data is only to read from */
+			i2cmsg.buf   = (unsigned char *)i2c_flush_data;
+
+			ret = i2c_transfer(da9052->adapter, &i2cmsg, 1);
+			if (ret < 0) {
+				dev_info(&da9052->i2c_client->dev,
+					 "%s: i2c_transfer failed!!!\n", __func__);
+				return ret;
+			}
 		}
 	}
-#endif
 
 	return 0;
 }
@@ -430,23 +418,23 @@ int da9052_i2c_read_many(struct da9052 *da9052,
 		return ret;
 	}
 
-#ifdef I2C_BUG_WORKAROUND
-	/* Test, whether last register to be accessed needs to be flushed */
-	if (!da9052_is_i2c_reg_safe(sscmsg[msg_no-1].addr)) {
-		i2cmsg.addr  = da9052->slave_addr;
-		i2cmsg.len   = 2;
-		i2cmsg.flags = 0;	 /* Write operation */
-		/* i2c_flush_data is only to read from */
-		i2cmsg.buf   = (unsigned char *)i2c_flush_data;
-
-		ret = i2c_transfer(da9052->adapter, &i2cmsg, 1);
-		if (ret < 0) {
-			dev_info(&da9052->i2c_client->dev,
-				 "%s: i2c_transfer failed!!!\n", __func__);
-			return ret;
+	if( da9052->chip_version <= DA9053_VERSION_BB ) {
+		/* Test, whether last register to be accessed needs to be flushed */
+		if (!da9052_is_i2c_reg_safe(sscmsg[msg_no-1].addr)) {
+			i2cmsg.addr  = da9052->slave_addr;
+			i2cmsg.len   = 2;
+			i2cmsg.flags = 0;	 /* Write operation */
+			/* i2c_flush_data is only to read from */
+			i2cmsg.buf   = (unsigned char *)i2c_flush_data;
+
+			ret = i2c_transfer(da9052->adapter, &i2cmsg, 1);
+			if (ret < 0) {
+				dev_info(&da9052->i2c_client->dev,
+					 "%s: i2c_transfer failed!!!\n", __func__);
+				return ret;
+			}
 		}
 	}
-#endif
 
 	/* Gather READ data */
 	for (cnt = 0; cnt < msg_no; cnt++)