From: Mikko Perttunen Date: Tue, 28 Jul 2015 08:34:11 +0000 (+0300) Subject: regulator: max8973: Set VSEL regmap ops if DVS GPIO is not set X-Git-Tag: firefly_0821_release~176^2~1211^2~3^5 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b10c7f3cc948107fb992d3a14eeaa0fdfb5c95da;p=firefly-linux-kernel-4.4.55.git regulator: max8973: Set VSEL regmap ops if DVS GPIO is not set 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 Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c index f67365962b67..8857cc02d9a8 100644 --- a/drivers/regulator/max8973-regulator.c +++ b/drivers/regulator/max8973-regulator.c @@ -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)