From: Mark Brown <broonie@linaro.org>
Date: Thu, 23 Jan 2014 12:01:24 +0000 (+0000)
Subject: Merge remote-tracking branches 'regulator/fix/pfuze100', 'regulator/fix/s5m8767'... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=849e1517a463369ce5db696ea74e07841bf65c9a;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge remote-tracking branches 'regulator/fix/pfuze100', 'regulator/fix/s5m8767', 'regulator/topic/ab8500', 'regulator/topic/act8865', 'regulator/topic/anatop', 'regulator/topic/arizona' and 'regulator/topic/as3722' into regulator-linus
---

849e1517a463369ce5db696ea74e07841bf65c9a
diff --cc drivers/regulator/arizona-micsupp.c
index fd3154d86901,fd3154d86901,724706a97dc4,724706a97dc4,724706a97dc4,724706a97dc4,3c75bf82eeb5,724706a97dc4..034ece707083
--- a/drivers/regulator/arizona-micsupp.c
+++ b/drivers/regulator/arizona-micsupp.c
@@@@@@@@@ -159,48 -159,48 -159,21 -159,21 -159,21 -159,21 -126,24 -159,21 +126,51 @@@@@@@@@ static const struct regulator_desc ariz
        	.name = "MICVDD",
        	.supply_name = "CPVDD",
        	.type = REGULATOR_VOLTAGE,
------ -	.n_voltages = ARIZONA_MICSUPP_MAX_SELECTOR + 1,
++++++ +	.n_voltages = 32,
  ++++ +	.ops = &arizona_micsupp_ops,
  ++++ +
  ++++ +	.vsel_reg = ARIZONA_LDO2_CONTROL_1,
  ++++ +	.vsel_mask = ARIZONA_LDO2_VSEL_MASK,
  ++++ +	.enable_reg = ARIZONA_MIC_CHARGE_PUMP_1,
  ++++ +	.enable_mask = ARIZONA_CPMIC_ENA,
  ++++ +	.bypass_reg = ARIZONA_MIC_CHARGE_PUMP_1,
  ++++ +	.bypass_mask = ARIZONA_CPMIC_BYPASS,
  ++++ +
++++++ +	.linear_ranges = arizona_micsupp_ranges,
++++++ +	.n_linear_ranges = ARRAY_SIZE(arizona_micsupp_ranges),
++++++ +
  ++++ +	.enable_time = 3000,
  ++++ +
  ++++ +	.owner = THIS_MODULE,
  ++++ +};
  ++++ +
  ++++++static const struct regulator_linear_range arizona_micsupp_ext_ranges[] = {
  ++++++	REGULATOR_LINEAR_RANGE(900000,  0,    0x14, 25000),
  ++++++	REGULATOR_LINEAR_RANGE(1500000, 0x15, 0x27, 100000),
  ++++++};
  ++++++
  ++++++static const struct regulator_desc arizona_micsupp_ext = {
  ++++++	.name = "MICVDD",
  ++++++	.supply_name = "CPVDD",
  ++++++	.type = REGULATOR_VOLTAGE,
  ++++++	.n_voltages = 40,
      + 	.ops = &arizona_micsupp_ops,
      + 
      + 	.vsel_reg = ARIZONA_LDO2_CONTROL_1,
      + 	.vsel_mask = ARIZONA_LDO2_VSEL_MASK,
      + 	.enable_reg = ARIZONA_MIC_CHARGE_PUMP_1,
      + 	.enable_mask = ARIZONA_CPMIC_ENA,
      + 	.bypass_reg = ARIZONA_MIC_CHARGE_PUMP_1,
      + 	.bypass_mask = ARIZONA_CPMIC_BYPASS,
      + 
  ++++++	.linear_ranges = arizona_micsupp_ext_ranges,
  ++++++	.n_linear_ranges = ARRAY_SIZE(arizona_micsupp_ext_ranges),
  ++++++
      + 	.enable_time = 3000,
      + 
      + 	.owner = THIS_MODULE,
      + };
      + 
        static const struct regulator_init_data arizona_micsupp_default = {
        	.constraints = {
        		.valid_ops_mask = REGULATOR_CHANGE_STATUS |