From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 23 Apr 2012 12:21:09 +0000 (+0100)
Subject: Merge branches 'regulator-regmap' and 'regulator-drivers' into regulator-next
X-Git-Tag: next-20120430~36^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7c031124f4eb463aabf7d8f217683fc131072a04;p=karo-tx-linux.git

Merge branches 'regulator-regmap' and 'regulator-drivers' into regulator-next
---

7c031124f4eb463aabf7d8f217683fc131072a04
diff --cc drivers/regulator/max8997.c
index 99d7cb33d616,db09244bb3ed,b88551be4521..704cd49ef375
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@@@ -805,10 -786,9 -797,9 +797,9 @@@@ static struct regulator_ops max8997_ldo
   	.is_enabled		= max8997_reg_is_enabled,
   	.enable			= max8997_reg_enable,
   	.disable		= max8997_reg_disable,
 - 	.get_voltage		= max8997_get_voltage,
 + 	.get_voltage_sel	= max8997_get_voltage_sel,
   	.set_voltage		= max8997_set_voltage_ldobuck,
 - 	.set_suspend_enable	= max8997_reg_enable_suspend,
 + 	.set_voltage_time_sel	= max8997_set_voltage_ldobuck_time_sel,
-  	.set_suspend_enable	= max8997_reg_enable_suspend,
   	.set_suspend_disable	= max8997_reg_disable_suspend,
   };
   
@@@@ -817,10 -797,9 -808,9 +808,9 @@@@ static struct regulator_ops max8997_buc
   	.is_enabled		= max8997_reg_is_enabled,
   	.enable			= max8997_reg_enable,
   	.disable		= max8997_reg_disable,
 - 	.get_voltage		= max8997_get_voltage,
 + 	.get_voltage_sel	= max8997_get_voltage_sel,
   	.set_voltage		= max8997_set_voltage_buck,
 - 	.set_suspend_enable	= max8997_reg_enable_suspend,
 + 	.set_voltage_time_sel	= max8997_set_voltage_ldobuck_time_sel,
-  	.set_suspend_enable	= max8997_reg_enable_suspend,
   	.set_suspend_disable	= max8997_reg_disable_suspend,
   };
   
@@@@ -838,9 -817,9 -827,8 +827,8 @@@@ static struct regulator_ops max8997_saf
   	.is_enabled		= max8997_reg_is_enabled,
   	.enable			= max8997_reg_enable,
   	.disable		= max8997_reg_disable,
 - 	.get_voltage		= max8997_get_voltage,
 + 	.get_voltage_sel	= max8997_get_voltage_sel,
   	.set_voltage		= max8997_set_voltage_safeout,
-- 	.set_suspend_enable	= max8997_reg_enable_suspend,
   	.set_suspend_disable	= max8997_reg_disable_suspend,
   };
   
@@@@ -887,9 -847,9 -875,8 +875,8 @@@@ static struct regulator_ops max8997_cha
   };
   
   static struct regulator_ops max8997_charger_fixedstate_ops = {
-- 	.is_enabled		= max8997_reg_is_enabled,
 - 	.get_current_limit	= max8997_get_voltage,
 - 	.set_current_limit	= max8997_set_voltage_ldobuck_wrap,
 + 	.get_current_limit	= max8997_get_current_limit,
 + 	.set_current_limit	= max8997_set_current_limit,
   };
   
   #define MAX8997_VOLTAGE_REGULATOR(_name, _ops) {\