Reviewed-by: Cheng Jian cj.chengjian@huawei.com

在 2021/10/23 20:49, lantianbaiyun 写道:

From: Axel Lin axel.lin@ingics.com

stable inclusion from stable-v5.10.44 commit 5a5f5cfb5f0996d65eae3cc034513d90f4be6783 bugzilla: https://bugzilla.openeuler.org/show_bug.cgi?id=401 CVE: NA

---

commit 34991ee96fd8477479dd15adadceb6b28b30d9b0 upstream.

Fixes: e6dea51e2d41 ("regulator: fan53880: Add initial support") Signed-off-by: Axel Lin axel.lin@ingics.com Acked-by: Christoph Fritz chf.fritz@googlemail.com Link: https://lore.kernel.org/r/20210517105325.1227393-1-axel.lin@ingics.com Signed-off-by: Mark Brown broonie@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Signed-off-by: lantianbaiyun lianyi21@mails.ucas.ac.cn

---

drivers/regulator/fan53880.c | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/drivers/regulator/fan53880.c b/drivers/regulator/fan53880.c index e83eb4fb1876..1684faf82ed2 100644 --- a/drivers/regulator/fan53880.c +++ b/drivers/regulator/fan53880.c @@ -51,6 +51,7 @@ static const struct regulator_ops fan53880_ops = { REGULATOR_LINEAR_RANGE(800000, 0xf, 0x73, 25000), \ }, \ .n_linear_ranges = 2, \

• .n_voltages =	   0x74,				\
  

  .vsel_reg = FAN53880_LDO ## _num ## VOUT, \ .vsel_mask = 0x7f, \ .enable_reg = FAN53880_ENABLE, \

@@ -76,6 +77,7 @@ static const struct regulator_desc fan53880_regulators[] = { REGULATOR_LINEAR_RANGE(600000, 0x1f, 0xf7, 12500), }, .n_linear_ranges = 2,

• .n_voltages =	   0xf8,
  

  .vsel_reg = FAN53880_BUCKVOUT, .vsel_mask = 0x7f, .enable_reg = FAN53880_ENABLE,

@@ -95,6 +97,7 @@ static const struct regulator_desc fan53880_regulators[] = { REGULATOR_LINEAR_RANGE(3000000, 0x4, 0x70, 25000), }, .n_linear_ranges = 2,

• .n_voltages =	   0x71,
  

  .vsel_reg = FAN53880_BOOSTVOUT, .vsel_mask = 0x7f, .enable_reg = FAN53880_ENABLE_BOOST,