From 4d5a15daae478e1a5b387d769c6b16eae0a744db Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 27 Jun 2023 15:41:05 +0000 Subject: [PATCH] Revert "regulator: pca9450: Fix BUCK2 enable_mask" This reverts commit 860ad704e4506a4716631a46e93c2ed4a6a0e23c which is commit d67dada3e2524514b09496b9ee1df22d4507a280 upstream. It is part of a series that breaks the Android kernel abi and can be safely reverted at this point in time. If it needs to come back in the future, it can be done so in an abi-safe way. Bug: 161946584 Change-Id: I33e439ca99e09cee71174eaa1149750bfee93c1e Signed-off-by: Greg Kroah-Hartman --- drivers/regulator/pca9450-regulator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/regulator/pca9450-regulator.c b/drivers/regulator/pca9450-regulator.c index b3d206ebb289..fd184c6c7c78 100644 --- a/drivers/regulator/pca9450-regulator.c +++ b/drivers/regulator/pca9450-regulator.c @@ -256,7 +256,7 @@ static const struct pca9450_regulator_desc pca9450a_regulators[] = { .vsel_reg = PCA9450_REG_BUCK2OUT_DVS0, .vsel_mask = BUCK2OUT_DVS0_MASK, .enable_reg = PCA9450_REG_BUCK2CTRL, - .enable_mask = BUCK2_ENMODE_MASK, + .enable_mask = BUCK1_ENMODE_MASK, .ramp_reg = PCA9450_REG_BUCK2CTRL, .ramp_mask = BUCK2_RAMP_MASK, .ramp_delay_table = pca9450_dvs_buck_ramp_table, @@ -494,7 +494,7 @@ static const struct pca9450_regulator_desc pca9450bc_regulators[] = { .vsel_reg = PCA9450_REG_BUCK2OUT_DVS0, .vsel_mask = BUCK2OUT_DVS0_MASK, .enable_reg = PCA9450_REG_BUCK2CTRL, - .enable_mask = BUCK2_ENMODE_MASK, + .enable_mask = BUCK1_ENMODE_MASK, .ramp_reg = PCA9450_REG_BUCK2CTRL, .ramp_mask = BUCK2_RAMP_MASK, .ramp_delay_table = pca9450_dvs_buck_ramp_table,