summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-11-24 14:02:50 +0000
committerMark Brown <broonie@linaro.org>2013-11-24 14:02:50 +0000
commit90ba0813db2c96c82e9ba24f30fb96a24a2cd3a8 (patch)
tree23d97244915dbf07103552a8681473a79698217b /drivers/regulator
parent3981560c2a8acae1a66cbf319f8ca1c92dde8f4d (diff)
parent88baf7148e899db7e0b676e4363647f50e48eaed (diff)
downloadlinux-stable-90ba0813db2c96c82e9ba24f30fb96a24a2cd3a8.tar.gz
linux-stable-90ba0813db2c96c82e9ba24f30fb96a24a2cd3a8.tar.bz2
linux-stable-90ba0813db2c96c82e9ba24f30fb96a24a2cd3a8.zip
Merge remote-tracking branch 'regulator/fix/pfuze100' into regulator-linus
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/pfuze100-regulator.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c
index ba67b2c4e2e7..032df3799efb 100644
--- a/drivers/regulator/pfuze100-regulator.c
+++ b/drivers/regulator/pfuze100-regulator.c
@@ -308,9 +308,15 @@ static int pfuze_identify(struct pfuze_chip *pfuze_chip)
if (ret)
return ret;
- if (value & 0x0f) {
- dev_warn(pfuze_chip->dev, "Illegal ID: %x\n", value);
- return -ENODEV;
+ switch (value & 0x0f) {
+ /* Freescale misprogrammed 1-3% of parts prior to week 8 of 2013 as ID=8 */
+ case 0x8:
+ dev_info(pfuze_chip->dev, "Assuming misprogrammed ID=0x8");
+ case 0x0:
+ break;
+ default:
+ dev_warn(pfuze_chip->dev, "Illegal ID: %x\n", value);
+ return -ENODEV;
}
ret = regmap_read(pfuze_chip->regmap, PFUZE100_REVID, &value);