diff options
| author |   Mark Brown <broonie@linaro.org> | 2014-01-15 11:46:35 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-15 11:46:35 +0000 |
| commit | 598911b42c940158caa1169092a804903bde845e (patch) | |
| tree | 15487a73d3854488ef679ee920c48fe1a90c28b3 /drivers/regulator/pfuze100-regulator.c | |
| parent | regulator: pfuze100: Improve PFUZE100 entry text (diff) | |
| parent | Linux 3.13-rc4 (diff) | |
| download | linux-dev-598911b42c940158caa1169092a804903bde845e.tar.xz linux-dev-598911b42c940158caa1169092a804903bde845e.zip | |
Merge tag 'v3.13-rc4' into regulator-pfuze100
Linux 3.13-rc4
Diffstat (limited to 'drivers/regulator/pfuze100-regulator.c')
| -rw-r--r-- | drivers/regulator/pfuze100-regulator.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c index 1d5ef37918f9..0c511ae52c42 100644 --- a/drivers/regulator/pfuze100-regulator.c +++ b/drivers/regulator/pfuze100-regulator.c @@ -38,7 +38,7 @@ #define PFUZE100_DEVICEID 0x0 #define PFUZE100_REVID 0x3 -#define PFUZE100_FABID 0x3 +#define PFUZE100_FABID 0x4 #define PFUZE100_SW1ABVOL 0x20 #define PFUZE100_SW1CVOL 0x2e @@ -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); |