rk2928:m720:compat pmic act8931 and tps65910

diff --git a/arch/arm/configs/rk2928_a720_defconfig b/arch/arm/configs/rk2928_a720_defconfig
index d218666ddeb0e03a1cbd16b0caae4c0b338cde14..c20716ea0ab3f830a77501d1a186188f841dea30 100644 (file)
--- a/arch/arm/configs/rk2928_a720_defconfig
+++ b/arch/arm/configs/rk2928_a720_defconfig
@@ -262,6 +262,7 @@ CONFIG_MFD_TPS65910=y
 CONFIG_MFD_TPS65090=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_TPS65910=y
+CONFIG_REGULATOR_ACT8931=y
 CONFIG_RK30_PWM_REGULATOR=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y

diff --git a/drivers/regulator/act8931.c b/drivers/regulator/act8931.c
index ae0b45168aeb346479fe3f4df1f01540b514dc98..e35f17d463070e09b4a6ecc9718ec57baf3881a4 100755 (executable)
--- a/drivers/regulator/act8931.c
+++ b/drivers/regulator/act8931.c
@@ -562,6 +562,12 @@ static int __devinit act8931_i2c_probe(struct i2c_client *i2c, const struct i2c_
        act8931->dev = &i2c->dev;
        i2c_set_clientdata(i2c, act8931);
        mutex_init(&act8931->io_lock);  
+
+       ret = act8931_reg_read(act8931,0x22);
+       if ((ret < 0) || (ret == 0xff)){
+               printk("The device is not act8931 \n");
+               return 0;
+       }
        
        if (pdata) {
                ret = setup_regulators(act8931, pdata);