From: 张晴 <zhangqing@rock-chips.com>
Date: Wed, 17 Oct 2012 09:55:43 +0000 (+0800)
Subject: rk2926:m713:slove io conflict for act8931 and tps65910
X-Git-Tag: firefly_0821_release~8387
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3149d13f5adf14009c83fac1858e718b508741db;p=firefly-linux-kernel-4.4.55.git

rk2926:m713:slove io conflict for act8931 and tps65910
---

diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index 6b16534548ad..181d68aa5902 100755
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -268,6 +268,12 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
 			      NULL, 0);
 	if (ret < 0)
 		goto err;
+
+	ret = tps65910_reg_read(tps65910,0x22);
+	if ((ret < 0) || (ret == 0xff)){
+		printk("The device is not tps65910\n");
+		goto err;
+	}
 	
 	g_tps65910 = tps65910;