From: Mark Brown <broonie@kernel.org>
Date: Mon, 6 May 2019 13:52:14 +0000 (+0900)
Subject: Merge branch 'regulator-5.2' into regulator-next
X-Git-Tag: v5.2-rc1~174^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2a23affe6a6a15111ae56edd7e4f3c9673ef201;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'regulator-5.2' into regulator-next
---

e2a23affe6a6a15111ae56edd7e4f3c9673ef201
diff --cc drivers/regulator/tps65217-regulator.c
index 546fb5cf20239,b0f5d8dcd7414..67ba78da77ecc
--- a/drivers/regulator/tps65217-regulator.c
+++ b/drivers/regulator/tps65217-regulator.c
@@@ -58,10 -58,9 +58,9 @@@ static const unsigned int LDO1_VSEL_tab
  
  static const struct regulator_linear_range tps65217_uv1_ranges[] = {
  	REGULATOR_LINEAR_RANGE(900000, 0, 24, 25000),
- 	REGULATOR_LINEAR_RANGE(1550000, 25, 30, 50000),
- 	REGULATOR_LINEAR_RANGE(1850000, 31, 52, 50000),
+ 	REGULATOR_LINEAR_RANGE(1550000, 25, 52, 50000),
  	REGULATOR_LINEAR_RANGE(3000000, 53, 55, 100000),
 -	REGULATOR_LINEAR_RANGE(3300000, 56, 62, 0),
 +	REGULATOR_LINEAR_RANGE(3300000, 56, 63, 0),
  };
  
  static const struct regulator_linear_range tps65217_uv2_ranges[] = {