diff options
| author | Robin Gong <B38343@freescale.com> | 2012-06-28 14:35:37 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-07-05 15:50:11 +0800 |
| commit | 221a40b4b0e7a897e398f9f76aa0a228f425f1ac (patch) | |
| tree | ca71d7711d16231864e8059994481c63ba420fcb | |
| parent | 0f619f19ef9a76279a4b4bcd9271365a0b7f72c5 (diff) | |
ENGR00215188-4 PFUZE : remove related old code in pfuze driver
1.remove related old code in pfuze driver
2.add i2c write retry as i2c read retry.
Signed-off-by: Robin Gong <B38343@freescale.com>
| -rw-r--r-- | drivers/mfd/pfuze-core.c | 10 | ||||
| -rw-r--r-- | drivers/regulator/pfuze100-regulator.c | 19 |
2 files changed, 7 insertions, 22 deletions
diff --git a/drivers/mfd/pfuze-core.c b/drivers/mfd/pfuze-core.c index 9c7a988cf89b..febd4b05dd0d 100644 --- a/drivers/mfd/pfuze-core.c +++ b/drivers/mfd/pfuze-core.c @@ -109,12 +109,16 @@ int pfuze_reg_write(struct mc_pfuze *mc_pfuze, unsigned int offset, unsigned char val) { unsigned char buf[2]; - int ret; + int ret, i; buf[0] = (unsigned char)offset; memcpy(&buf[1], &val, 1); - - ret = i2c_master_send(mc_pfuze->i2c_client, buf, 2); + for (i = 0; i < PFUZE_I2C_RETRY_TIMES; i++) { + ret = i2c_master_send(mc_pfuze->i2c_client, buf, 2); + if (ret == 2) + break; + msleep(1); + } if (ret != 2) { dev_err(&mc_pfuze->i2c_client->dev, "write failed!:%i\n", ret); return ret; diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c index e2aaa2d4e889..34ca0fb45961 100644 --- a/drivers/regulator/pfuze100-regulator.c +++ b/drivers/regulator/pfuze100-regulator.c @@ -657,21 +657,6 @@ static int __devexit pfuze100_regulator_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_MX6_INTER_LDO_BYPASS -int cpu_freq_suspend_in; /*judge for in suspend or not*/ -static int pfuze100_regulator_suspend(struct platform_device *pdev, - pm_message_t state) -{ - cpu_freq_suspend_in = 1; - return 0; -} - -static int pfuze100_regulator_resume(struct platform_device *pdev) -{ - cpu_freq_suspend_in = 0; - return 0; -} -#endif static struct platform_driver pfuze100_regulator_driver = { .driver = { .name = "pfuze100-regulator", @@ -679,10 +664,6 @@ static struct platform_driver pfuze100_regulator_driver = { }, .remove = __devexit_p(pfuze100_regulator_remove), .probe = pfuze100_regulator_probe, -#ifdef CONFIG_MX6_INTER_LDO_BYPASS - .suspend = pfuze100_regulator_suspend, - .resume = pfuze100_regulator_resume, -#endif }; static int __init pfuze100_regulator_init(void) |