Merge tag 'ti-v2020.07-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti

[oweals/u-boot.git] / drivers / power / regulator / pfuze100.c

diff --git a/drivers/power/regulator/pfuze100.c b/drivers/power/regulator/pfuze100.c
index 02f38944453d9d9bc52ad257b007aee81d3f0a30..b56843046f273691956eb60e38fcce9339c01d7f 100644 (file)
--- a/drivers/power/regulator/pfuze100.c
+++ b/drivers/power/regulator/pfuze100.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2017 NXP
  *
  * Peng Fan <peng.fan@nxp.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -11,6 +10,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <log.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/pfuze100_pmic.h>
@@ -483,11 +483,11 @@ static int pfuze100_regulator_val(struct udevice *dev, int op, int *uV)
                debug("Set voltage for REGULATOR_TYPE_FIXED regulator\n");
                return -EINVAL;
        } else if (desc->volt_table) {
-               for (i = 0; i < desc->vsel_mask; i++) {
+               for (i = 0; i <= desc->vsel_mask; i++) {
                        if (*uV == desc->volt_table[i])
                                break;
                }
-               if (i == desc->vsel_mask) {
+               if (i == desc->vsel_mask + 1) {
                        debug("Unsupported voltage %u\n", *uV);
                        return -EINVAL;
                }
@@ -524,7 +524,7 @@ static int pfuze100_regulator_set_value(struct udevice *dev, int uV)
        return pfuze100_regulator_val(dev, PMIC_OP_SET, &uV);
 }
 
-static bool pfuze100_regulator_get_enable(struct udevice *dev)
+static int pfuze100_regulator_get_enable(struct udevice *dev)
 {
        int ret;
        bool enable = false;