Merge branch 'for_3.4/pm/smps-regulator' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --cc arch/arm/mach-omap2/twl-common.c
index 7a7b89304c48eeb2e1af9f9b87f77d9d5dd5a6f1,1ddad222361ac0f64f3d10e0292143b90c8f249c..ee6596b4521481ebd4c167860bfb9766f7390ad5
--- 1/arch/arm/mach-omap2/twl-common.c
--- 2/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)