diff options
| author | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2020-07-06 20:17:30 +0300 |
|---|---|---|
| committer | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2020-07-06 20:24:05 +0300 |
| commit | d6e1cff14875d6ce338c1f27afe0639ef0f97b79 (patch) | |
| tree | 2449859b19a9e58abb0414700621a86f234d91d6 /drivers/regulator/bd71837-regulator.c | |
| parent | 453fdfde79e13e27030a56c7ea787e98698b0dba (diff) | |
| parent | 0347fe7527d062e1762498cb5863bcd5bde0997b (diff) | |
Merge branch 'imx_4.14.98_2.3.0' into toradex_4.14-2.3.x-imx
Fix conflicts after merging changes from the latest NXP branch.
Conflicts:
arch/arm64/boot/dts/freescale/fsl-imx8qm-device.dtsi
drivers/pci/dwc/pci-imx6.c
Related-to: ELB-1306
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Diffstat (limited to 'drivers/regulator/bd71837-regulator.c')
| -rw-r--r-- | drivers/regulator/bd71837-regulator.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/regulator/bd71837-regulator.c b/drivers/regulator/bd71837-regulator.c index 38c70726ef43..3d6a7f849116 100644 --- a/drivers/regulator/bd71837-regulator.c +++ b/drivers/regulator/bd71837-regulator.c @@ -174,10 +174,10 @@ static const struct regulator_linear_range bd71837_buck8_voltage_ranges[] = { /* * LDO1 - * 3.0 to 3.3V (100mV step) + * 1.6 to 1.9V (100mV step) */ static const struct regulator_linear_range bd71837_ldo1_voltage_ranges[] = { - REGULATOR_LINEAR_RANGE(3000000, 0x00, 0x03, 100000), + REGULATOR_LINEAR_RANGE(1600000, 0x00, 0x03, 100000), }; /* @@ -351,7 +351,7 @@ static const struct regulator_desc bd71837_regulators[] = { .owner = THIS_MODULE, }, /* - * LDO2 0.9V + * LDO2 0.8V * Fixed voltage */ { @@ -360,7 +360,7 @@ static const struct regulator_desc bd71837_regulators[] = { .ops = &bd71837_fixed_regulator_ops, .type = REGULATOR_VOLTAGE, .n_voltages = BD71837_LDO2_VOLTAGE_NUM, - .min_uV = 900000, + .min_uV = 800000, .enable_reg = BD71837_REG_LDO2_VOLT, .enable_mask = LDO2_EN, .enable_time = 1000, |