Merge remote-tracking branches 'regulator/topic/db8500', 'regulator/topic/gpio',...

[~andy/linux] / drivers / regulator / pfuze100-regulator.c

diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c
index ba67b2c4e2e7fe4da91fdd6afd269ab1233a284e..ab174f20ca11f473c889848b1d7e6b7545a9e3ef 100644 (file)
--- 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,7 +308,16 @@ static int pfuze_identify(struct pfuze_chip *pfuze_chip)
        if (ret)
                return ret;
 
-       if (value & 0x0f) {
+       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;
        }
@@ -317,7 +326,7 @@ static int pfuze_identify(struct pfuze_chip *pfuze_chip)
        if (ret)
                return ret;
        dev_info(pfuze_chip->dev,
-                "Full lay: %x, Metal lay: %x\n",
+                "Full layer: %x, Metal layer: %x\n",
                 (value & 0xf0) >> 4, value & 0x0f);
 
        ret = regmap_read(pfuze_chip->regmap, PFUZE100_FABID, &value);
@@ -402,31 +411,18 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
                config.driver_data = pfuze_chip;
                config.of_node = match_of_node(i);
 
-               pfuze_chip->regulators[i] = regulator_register(desc, &config);
+               pfuze_chip->regulators[i] =
+                       devm_regulator_register(&client->dev, desc, &config);
                if (IS_ERR(pfuze_chip->regulators[i])) {
                        dev_err(&client->dev, "register regulator%s failed\n",
                                pfuze100_regulators[i].desc.name);
-                       ret = PTR_ERR(pfuze_chip->regulators[i]);
-                       while (--i >= 0)
-                               regulator_unregister(pfuze_chip->regulators[i]);
-                       return ret;
+                       return PTR_ERR(pfuze_chip->regulators[i]);
                }
        }
 
        return 0;
 }
 
-static int pfuze100_regulator_remove(struct i2c_client *client)
-{
-       int i;
-       struct pfuze_chip *pfuze_chip = i2c_get_clientdata(client);
-
-       for (i = 0; i < PFUZE100_MAX_REGULATOR; i++)
-               regulator_unregister(pfuze_chip->regulators[i]);
-
-       return 0;
-}
-
 static struct i2c_driver pfuze_driver = {
        .id_table = pfuze_device_id,
        .driver = {
@@ -435,7 +431,6 @@ static struct i2c_driver pfuze_driver = {
                .of_match_table = pfuze_dt_ids,
        },
        .probe = pfuze100_regulator_probe,
-       .remove = pfuze100_regulator_remove,
 };
 module_i2c_driver(pfuze_driver);