From: Tony Lindgren <tony@atomide.com>
Date: Mon, 30 Apr 2012 17:08:29 +0000 (-0700)
Subject: Merge branch 'for_3.4/pm/smps-regulator' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.5-rc1~151^2~6^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8822e2d570bc265c9fa0347710fbcc7bef8b327;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'for_3.4/pm/smps-regulator' of git://git./linux/kernel/git/khilman/linux-omap-pm into pm-regulator

Conflicts:
	arch/arm/mach-omap2/twl-common.c
---

a8822e2d570bc265c9fa0347710fbcc7bef8b327
diff --cc arch/arm/mach-omap2/twl-common.c
index 7a7b893,1ddad22..ee6596b
--- a/arch/arm/mach-omap2/twl-common.c
+++ b/arch/arm/mach-omap2/twl-common.c
@@@ -37,16 -38,18 +38,28 @@@ static struct i2c_board_info __initdat
  	.flags		= I2C_CLIENT_WAKE,
  };
  
 +static struct i2c_board_info __initdata omap4_i2c1_board_info[] = {
 +	{
 +		.addr		= 0x48,
 +		.flags		= I2C_CLIENT_WAKE,
 +	},
 +	{
 +		I2C_BOARD_INFO("twl6040", 0x4b),
 +	},
 +};
 +
+ static int twl_set_voltage(void *data, int target_uV)
+ {
+ 	struct voltagedomain *voltdm = (struct voltagedomain *)data;
+ 	return voltdm_scale(voltdm, target_uV);
+ }
+ 
+ static int twl_get_voltage(void *data)
+ {
+ 	struct voltagedomain *voltdm = (struct voltagedomain *)data;
+ 	return voltdm_get_voltage(voltdm);
+ }
+ 
  void __init omap_pmic_init(int bus, u32 clkrate,
  			   const char *pmic_type, int pmic_irq,
  			   struct twl4030_platform_data *pmic_data)