]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
regulator: max8973: Set VSEL regmap ops if DVS GPIO is not set
authorMikko Perttunen <mperttunen@nvidia.com>
Tue, 28 Jul 2015 08:34:11 +0000 (11:34 +0300)
committerMark Brown <broonie@kernel.org>
Wed, 29 Jul 2015 13:55:51 +0000 (14:55 +0100)
Use regmap helpers for get_voltage_sel and set_voltage_sel ops
if the DVS GPIO is not set.

The DVS GPIO allows on the fly selection of the VSEL register
from two choices. However, if it is not set, the VSEL register
will stay fixed and we can use the regmap ops. This allows use
of the *hardware_vsel* regulator APIs.

Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/max8973-regulator.c

index f67365962b6741b93e62c5a0d717c41fdc9a91d8..8857cc02d9a8140ca33703c6f89f49b22578f800 100644 (file)
@@ -637,6 +637,15 @@ static int max8973_probe(struct i2c_client *client,
                        max->lru_index[i] = i;
                max->lru_index[0] = max->curr_vout_reg;
                max->lru_index[max->curr_vout_reg] = 0;
+       } else {
+               /*
+                * If there is no DVS GPIO, the VOUT register
+                * address is fixed.
+                */
+               max->ops.set_voltage_sel = regulator_set_voltage_sel_regmap;
+               max->ops.get_voltage_sel = regulator_get_voltage_sel_regmap;
+               max->desc.vsel_reg = max->curr_vout_reg;
+               max->desc.vsel_mask = MAX8973_VOUT_MASK;
        }
 
        if (pdata_from_dt)