diff options
| author | Tom Rini <trini@konsulko.com> | 2017-06-27 13:32:37 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-27 13:32:37 (GMT) |
| commit | 821560fd8e43eecc208c1c52ad24faadb6b52703 (patch) | |
| tree | efb56bc170674d3a6680ca4d343888e9e84403c7 /drivers/power | |
| parent | b8a238f1376f16c387765107b9d7f62e4358dd48 (diff) | |
| parent | 65496a34835cb4c9547bd02dd15b018c333add9d (diff) | |
| download | u-boot-fsl-qoriq-821560fd8e43eecc208c1c52ad24faadb6b52703.tar.xz | |
Merge git://www.denx.de/git/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/configs/imx6qdl_icore_rqs.h
include/configs/imx6ul_geam.h
include/configs/imx6ul_isiot.h
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/regulator/pfuze100.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/power/regulator/pfuze100.c b/drivers/power/regulator/pfuze100.c index 4702161..02f3894 100644 --- a/drivers/power/regulator/pfuze100.c +++ b/drivers/power/regulator/pfuze100.c @@ -1,3 +1,11 @@ +/* + * Copyright 2017 NXP + * + * Peng Fan <peng.fan@nxp.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + #include <common.h> #include <fdtdec.h> #include <errno.h> @@ -306,7 +314,7 @@ static int pfuze100_regulator_probe(struct udevice *dev) static int pfuze100_regulator_mode(struct udevice *dev, int op, int *opmode) { - unsigned char val; + int val; struct pfuze100_regulator_platdata *plat = dev_get_platdata(dev); struct pfuze100_regulator_desc *desc = plat->desc; @@ -376,7 +384,7 @@ static int pfuze100_regulator_mode(struct udevice *dev, int op, int *opmode) static int pfuze100_regulator_enable(struct udevice *dev, int op, bool *enable) { - unsigned char val; + int val; int ret, on_off; struct dm_regulator_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); @@ -440,7 +448,7 @@ static int pfuze100_regulator_enable(struct udevice *dev, int op, bool *enable) static int pfuze100_regulator_val(struct udevice *dev, int op, int *uV) { int i; - unsigned char val; + int val; struct pfuze100_regulator_platdata *plat = dev_get_platdata(dev); struct pfuze100_regulator_desc *desc = plat->desc; struct dm_regulator_uclass_platdata *uc_pdata = |