From: Mark Brown <broonie@kernel.org>
Date: Fri, 17 Jul 2015 11:42:48 +0000 (+0100)
Subject: Merge branch 'fix/88pm800' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v4.14-rc1~4829^2~5^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bf1fc23c80e61695e8e899354d17549a4946a9d0;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'fix/88pm800' of git://git./linux/kernel/git/broonie/regulator into regulator-88pm800

Conflicts:
	drivers/regulator/88pm800.c
---

bf1fc23c80e61695e8e899354d17549a4946a9d0
diff --cc drivers/regulator/88pm800.c
index 26c277f,7fd4f51..a62a896
--- a/drivers/regulator/88pm800.c
+++ b/drivers/regulator/88pm800.c
@@@ -121,24 -120,22 +121,24 @@@ struct pm800_regulators 
   * For all the LDOes, there are too many ranges. Using volt_table will be
   * simpler and faster.
   */
 -#define PM800_LDO(vreg, ereg, ebit, amax, ldo_volt_table)		\
 +#define PM800_LDO(match, vreg, ereg, ebit, amax, ldo_volt_table)	\
  {									\
  	.desc	= {							\
 -		.name	= #vreg,					\
 -		.ops	= &pm800_volt_table_ops,			\
 -		.type	= REGULATOR_VOLTAGE,				\
 -		.id	= PM800_ID_##vreg,				\
 -		.owner	= THIS_MODULE,					\
 -		.n_voltages = ARRAY_SIZE(ldo_volt_table),		\
 -		.vsel_reg	= PM800_##vreg##_VOUT,			\
 -		.vsel_mask	= 0xf,					\
 -		.enable_reg	= PM800_##ereg,				\
 -		.enable_mask	= 1 << (ebit),				\
 -		.volt_table	= ldo_volt_table,			\
 +		.name			= #vreg,			\
 +		.of_match		= of_match_ptr(#match),		\
 +		.regulators_node	= of_match_ptr("regulators"),	\
 +		.ops			= &pm800_volt_table_ops,	\
 +		.type			= REGULATOR_VOLTAGE,		\
 +		.id			= PM800_ID_##vreg,		\
 +		.owner			= THIS_MODULE,			\
 +		.n_voltages		= ARRAY_SIZE(ldo_volt_table),	\
 +		.vsel_reg		= PM800_##vreg##_VOUT,		\
- 		.vsel_mask		= 0x1f,				\
++		.vsel_mask		= 0xf,				\
 +		.enable_reg		= PM800_##ereg,			\
 +		.enable_mask		= 1 << (ebit),			\
 +		.volt_table		= ldo_volt_table,		\
  	},								\
 -	.max_ua		= (amax),					\
 +	.max_ua	= (amax),						\
  }
  
  /* Ranges are sorted in ascending order. */