]> asedeno.scripts.mit.edu Git - linux.git/blobdiff - drivers/regulator/pfuze100-regulator.c
Merge branch 'for-4.20/logitech-highres' into for-linus
[linux.git] / drivers / regulator / pfuze100-regulator.c
index 8d9dbcc775eaa77dce16612d451b9a790dacc45b..31c3a236120a80909ede26f29caa5288011d8cbf 100644 (file)
@@ -17,6 +17,8 @@
 #include <linux/slab.h>
 #include <linux/regmap.h>
 
+#define PFUZE_FLAG_DISABLE_SW  BIT(1)
+
 #define PFUZE_NUMREGS          128
 #define PFUZE100_VOL_OFFSET    0
 #define PFUZE100_STANDBY_OFFSET        1
 #define PFUZE100_VGEN5VOL      0x70
 #define PFUZE100_VGEN6VOL      0x71
 
-enum chips { PFUZE100, PFUZE200, PFUZE3000 = 3 };
+enum chips { PFUZE100, PFUZE200, PFUZE3000 = 3, PFUZE3001 = 0x31, };
 
 struct pfuze_regulator {
        struct regulator_desc desc;
        unsigned char stby_reg;
        unsigned char stby_mask;
+       bool sw_reg;
 };
 
 struct pfuze_chip {
        int     chip_id;
+       int     flags;
        struct regmap *regmap;
        struct device *dev;
        struct pfuze_regulator regulator_descs[PFUZE100_MAX_REGULATOR];
@@ -92,6 +96,7 @@ static const struct i2c_device_id pfuze_device_id[] = {
        {.name = "pfuze100", .driver_data = PFUZE100},
        {.name = "pfuze200", .driver_data = PFUZE200},
        {.name = "pfuze3000", .driver_data = PFUZE3000},
+       {.name = "pfuze3001", .driver_data = PFUZE3001},
        { }
 };
 MODULE_DEVICE_TABLE(i2c, pfuze_device_id);
@@ -100,6 +105,7 @@ static const struct of_device_id pfuze_dt_ids[] = {
        { .compatible = "fsl,pfuze100", .data = (void *)PFUZE100},
        { .compatible = "fsl,pfuze200", .data = (void *)PFUZE200},
        { .compatible = "fsl,pfuze3000", .data = (void *)PFUZE3000},
+       { .compatible = "fsl,pfuze3001", .data = (void *)PFUZE3001},
        { }
 };
 MODULE_DEVICE_TABLE(of, pfuze_dt_ids);
@@ -108,10 +114,28 @@ static int pfuze100_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
 {
        struct pfuze_chip *pfuze100 = rdev_get_drvdata(rdev);
        int id = rdev_get_id(rdev);
+       bool reg_has_ramp_delay;
        unsigned int ramp_bits;
        int ret;
 
-       if (id < PFUZE100_SWBST) {
+       switch (pfuze100->chip_id) {
+       case PFUZE3001:
+               /* no dynamic voltage scaling for PF3001 */
+               reg_has_ramp_delay = false;
+               break;
+       case PFUZE3000:
+               reg_has_ramp_delay = (id < PFUZE3000_SWBST);
+               break;
+       case PFUZE200:
+               reg_has_ramp_delay = (id < PFUZE200_SWBST);
+               break;
+       case PFUZE100:
+       default:
+               reg_has_ramp_delay = (id < PFUZE100_SWBST);
+               break;
+       }
+
+       if (reg_has_ramp_delay) {
                ramp_delay = 12500 / ramp_delay;
                ramp_bits = (ramp_delay >> 1) - (ramp_delay >> 3);
                ret = regmap_update_bits(pfuze100->regmap,
@@ -119,8 +143,9 @@ static int pfuze100_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
                                         0xc0, ramp_bits << 6);
                if (ret < 0)
                        dev_err(pfuze100->dev, "ramp failed, err %d\n", ret);
-       } else
+       } else {
                ret = -EACCES;
+       }
 
        return ret;
 }
@@ -142,6 +167,14 @@ static const struct regulator_ops pfuze100_fixed_regulator_ops = {
 };
 
 static const struct regulator_ops pfuze100_sw_regulator_ops = {
+       .list_voltage = regulator_list_voltage_linear,
+       .set_voltage_sel = regulator_set_voltage_sel_regmap,
+       .get_voltage_sel = regulator_get_voltage_sel_regmap,
+       .set_voltage_time_sel = regulator_set_voltage_time_sel,
+       .set_ramp_delay = pfuze100_set_ramp_delay,
+};
+
+static const struct regulator_ops pfuze100_sw_disable_regulator_ops = {
        .enable = regulator_enable_regmap,
        .disable = regulator_disable_regmap,
        .is_enabled = regulator_is_enabled_regmap,
@@ -192,13 +225,11 @@ static const struct regulator_ops pfuze100_swb_regulator_ops = {
                        .vsel_reg = (base) + PFUZE100_VOL_OFFSET,       \
                        .vsel_mask = 0x3f,      \
                        .enable_reg = (base) + PFUZE100_MODE_OFFSET,    \
-                       .enable_val = 0xc,      \
-                       .disable_val = 0x0,     \
                        .enable_mask = 0xf,     \
-                       .enable_time = 500,     \
                },      \
                .stby_reg = (base) + PFUZE100_STANDBY_OFFSET,   \
                .stby_mask = 0x3f,      \
+               .sw_reg = true,         \
        }
 
 #define PFUZE100_SWB_REG(_chip, _name, base, mask, voltages)   \
@@ -361,6 +392,19 @@ static struct pfuze_regulator pfuze3000_regulators[] = {
        PFUZE100_VGEN_REG(PFUZE3000, VLDO4, PFUZE100_VGEN6VOL, 1800000, 3300000, 100000),
 };
 
+static struct pfuze_regulator pfuze3001_regulators[] = {
+       PFUZE100_SWB_REG(PFUZE3001, SW1, PFUZE100_SW1ABVOL, 0x1f, pfuze3000_sw1a),
+       PFUZE100_SWB_REG(PFUZE3001, SW2, PFUZE100_SW2VOL, 0x7, pfuze3000_sw2lo),
+       PFUZE3000_SW3_REG(PFUZE3001, SW3, PFUZE100_SW3AVOL, 900000, 1650000, 50000),
+       PFUZE100_SWB_REG(PFUZE3001, VSNVS, PFUZE100_VSNVSVOL, 0x7, pfuze100_vsnvs),
+       PFUZE100_VGEN_REG(PFUZE3001, VLDO1, PFUZE100_VGEN1VOL, 1800000, 3300000, 100000),
+       PFUZE100_VGEN_REG(PFUZE3001, VLDO2, PFUZE100_VGEN2VOL, 800000, 1550000, 50000),
+       PFUZE3000_VCC_REG(PFUZE3001, VCCSD, PFUZE100_VGEN3VOL, 2850000, 3300000, 150000),
+       PFUZE3000_VCC_REG(PFUZE3001, V33, PFUZE100_VGEN4VOL, 2850000, 3300000, 150000),
+       PFUZE100_VGEN_REG(PFUZE3001, VLDO3, PFUZE100_VGEN5VOL, 1800000, 3300000, 100000),
+       PFUZE100_VGEN_REG(PFUZE3001, VLDO4, PFUZE100_VGEN6VOL, 1800000, 3300000, 100000),
+};
+
 #ifdef CONFIG_OF
 /* PFUZE100 */
 static struct of_regulator_match pfuze100_matches[] = {
@@ -418,6 +462,21 @@ static struct of_regulator_match pfuze3000_matches[] = {
        { .name = "vldo4",      },
 };
 
+/* PFUZE3001 */
+static struct of_regulator_match pfuze3001_matches[] = {
+
+       { .name = "sw1",        },
+       { .name = "sw2",        },
+       { .name = "sw3",        },
+       { .name = "vsnvs",      },
+       { .name = "vldo1",      },
+       { .name = "vldo2",      },
+       { .name = "vccsd",      },
+       { .name = "v33",        },
+       { .name = "vldo3",      },
+       { .name = "vldo4",      },
+};
+
 static struct of_regulator_match *pfuze_matches;
 
 static int pfuze_parse_regulators_dt(struct pfuze_chip *chip)
@@ -430,6 +489,9 @@ static int pfuze_parse_regulators_dt(struct pfuze_chip *chip)
        if (!np)
                return -EINVAL;
 
+       if (of_property_read_bool(np, "fsl,pfuze-support-disable-sw"))
+               chip->flags |= PFUZE_FLAG_DISABLE_SW;
+
        parent = of_get_child_by_name(np, "regulators");
        if (!parent) {
                dev_err(dev, "regulators node not found\n");
@@ -437,6 +499,11 @@ static int pfuze_parse_regulators_dt(struct pfuze_chip *chip)
        }
 
        switch (chip->chip_id) {
+       case PFUZE3001:
+               pfuze_matches = pfuze3001_matches;
+               ret = of_regulator_match(dev, parent, pfuze3001_matches,
+                                        ARRAY_SIZE(pfuze3001_matches));
+               break;
        case PFUZE3000:
                pfuze_matches = pfuze3000_matches;
                ret = of_regulator_match(dev, parent, pfuze3000_matches,
@@ -508,7 +575,8 @@ static int pfuze_identify(struct pfuze_chip *pfuze_chip)
                 */
                dev_info(pfuze_chip->dev, "Assuming misprogrammed ID=0x8");
        } else if ((value & 0x0f) != pfuze_chip->chip_id &&
-                  (value & 0xf0) >> 4 != pfuze_chip->chip_id) {
+                  (value & 0xf0) >> 4 != pfuze_chip->chip_id &&
+                  (value != pfuze_chip->chip_id)) {
                /* device id NOT match with your setting */
                dev_warn(pfuze_chip->dev, "Illegal ID: %x\n", value);
                return -ENODEV;
@@ -588,6 +656,13 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
 
        /* use the right regulators after identify the right device */
        switch (pfuze_chip->chip_id) {
+       case PFUZE3001:
+               pfuze_chip->pfuze_regulators = pfuze3001_regulators;
+               regulator_num = ARRAY_SIZE(pfuze3001_regulators);
+               sw_check_start = PFUZE3001_SW2;
+               sw_check_end = PFUZE3001_SW2;
+               sw_hi = 1 << 3;
+               break;
        case PFUZE3000:
                pfuze_chip->pfuze_regulators = pfuze3000_regulators;
                regulator_num = ARRAY_SIZE(pfuze3000_regulators);
@@ -611,7 +686,8 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
        }
        dev_info(&client->dev, "pfuze%s found.\n",
                (pfuze_chip->chip_id == PFUZE100) ? "100" :
-               ((pfuze_chip->chip_id == PFUZE200) ? "200" : "3000"));
+               (((pfuze_chip->chip_id == PFUZE200) ? "200" :
+               ((pfuze_chip->chip_id == PFUZE3000) ? "3000" : "3001"))));
 
        memcpy(pfuze_chip->regulator_descs, pfuze_chip->pfuze_regulators,
                sizeof(pfuze_chip->regulator_descs));
@@ -636,7 +712,8 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
                if (i >= sw_check_start && i <= sw_check_end) {
                        regmap_read(pfuze_chip->regmap, desc->vsel_reg, &val);
                        if (val & sw_hi) {
-                               if (pfuze_chip->chip_id == PFUZE3000) {
+                               if (pfuze_chip->chip_id == PFUZE3000 ||
+                                       pfuze_chip->chip_id == PFUZE3001) {
                                        desc->volt_table = pfuze3000_sw2hi;
                                        desc->n_voltages = ARRAY_SIZE(pfuze3000_sw2hi);
                                } else {
@@ -647,6 +724,21 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
                        }
                }
 
+               /*
+                * Allow SW regulators to turn off. Checking it trough a flag is
+                * a workaround to keep the backward compatibility with existing
+                * old dtb's which may relay on the fact that we didn't disable
+                * the switched regulator till yet.
+                */
+               if (pfuze_chip->flags & PFUZE_FLAG_DISABLE_SW) {
+                       if (pfuze_chip->regulator_descs[i].sw_reg) {
+                               desc->ops = &pfuze100_sw_disable_regulator_ops;
+                               desc->enable_val = 0x8;
+                               desc->disable_val = 0x0;
+                               desc->enable_time = 500;
+                       }
+               }
+
                config.dev = &client->dev;
                config.init_data = init_data;
                config.driver_data = pfuze_chip;
@@ -675,5 +767,5 @@ static struct i2c_driver pfuze_driver = {
 module_i2c_driver(pfuze_driver);
 
 MODULE_AUTHOR("Robin Gong <b38343@freescale.com>");
-MODULE_DESCRIPTION("Regulator Driver for Freescale PFUZE100/200/3000 PMIC");
+MODULE_DESCRIPTION("Regulator Driver for Freescale PFUZE100/200/3000/3001 PMIC");
 MODULE_LICENSE("GPL v2");