From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756960Ab3G3Cqf (ORCPT ); Mon, 29 Jul 2013 22:46:35 -0400 Received: from mail-pb0-f41.google.com ([209.85.160.41]:51769 "EHLO mail-pb0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753230Ab3G3Cqe (ORCPT ); Mon, 29 Jul 2013 22:46:34 -0400 Message-ID: <1375152388.4265.1.camel@phoenix> Subject: [PATCH RFT] regulator: pfuze100: Fix n_voltages setting for SW2~SW4 with high bit set From: Axel Lin To: Mark Brown Cc: Robin Gong , Liam Girdwood , linux-kernel@vger.kernel.org Date: Tue, 30 Jul 2013 10:46:28 +0800 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.6.4-0ubuntu1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Current code adjust min_uV and uV_step but missed adjusting the n_voltages setting. When BIT6 is clear: n_voltages = (1975000 - 400000) / 25000 + 1 = 64 When BIT6 is set: n_voltages = (3300000 - 800000) / 50000 + 1 = 51 The n_voltages needs update because when BIT6 is set 0x73 ~ 0x7f are reserved. When using regulator_list_voltage_linear, the n_voltages does matter here because wrong n_voltages setting make the equation return wrong result. e.g. if selector is 63, regulator_list_voltage_linear returns 800000 + (50000 * 63) = 4000000 It should return -EINVAL if the selector is in the range of 51 ~ 63. Signed-off-by: Axel Lin --- drivers/regulator/pfuze100-regulator.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c index 2dadc31..a77379b 100644 --- a/drivers/regulator/pfuze100-regulator.c +++ b/drivers/regulator/pfuze100-regulator.c @@ -387,8 +387,11 @@ static int pfuze100_regulator_probe(struct i2c_client *client, for (i = 0; i < PFUZE100_MAX_REGULATOR; i++) { struct regulator_init_data *init_data; + struct regulator_desc *desc; int val; + desc = &pfuze_chip->regulator_descs[i].desc; + if (pdata) init_data = pdata->init_data[i]; else @@ -396,13 +399,11 @@ static int pfuze100_regulator_probe(struct i2c_client *client, /* SW2~SW4 high bit check and modify the voltage value table */ if (i > PFUZE100_SW1C && i < PFUZE100_SWBST) { - regmap_read(pfuze_chip->regmap, PFUZE100_SW2VOL + - (i - PFUZE100_SW2) * 7, &val); + regmap_read(pfuze_chip->regmap, desc->vsel_reg, &val); if (val & 0x40) { - pfuze_chip->regulator_descs[i].desc.min_uV - = 800000; - pfuze_chip->regulator_descs[i].desc.uV_step - = 50000; + desc->min_uV = 800000; + desc->uV_step = 50000; + desc->n_voltages = 51; } } @@ -411,8 +412,7 @@ 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(&pfuze_chip - ->regulator_descs[i].desc, &config); + pfuze_chip->regulators[i] = regulator_register(desc, &config); if (IS_ERR(pfuze_chip->regulators[i])) { dev_err(&client->dev, "register regulator%s failed\n", pfuze100_regulators[i].desc.name); -- 1.8.1.2