Merge remote-tracking branch 'regulator/topic/tps65910' into regulator-next

diff --combined drivers/regulator/tps65910-regulator.c
index 6b77bbf32ebcf7db26e1b1d85d05268efd7fa1eb,1d2dd1864ae75e9b9703a7a44ac73d4c9eb9c308..59c3770fa77dbe5b77ae1b3c96c1e105cae8f58e
--- 1/drivers/regulator/tps65910-regulator.c
--- 2/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@@ -38,6 -38,11 +38,11 @@@ static const unsigned int VIO_VSEL_tabl
  
  /* VSEL tables for TPS65910 specific LDOs and dcdc's */
  
+ /* supported VRTC voltages in microvolts */
+ static const unsigned int VRTC_VSEL_table[] = {
+       1800000,
+ };
+ 
  /* supported VDD3 voltages in microvolts */
  static const unsigned int VDD3_VSEL_table[] = {
        5000000,
@@@ -95,6 -100,8 +100,8 @@@ static struct tps_info tps65910_regs[] 
        {
                .name = "vrtc",
                .vin_name = "vcc7",
+               .n_voltages = ARRAY_SIZE(VRTC_VSEL_table),
+               .voltage_table = VRTC_VSEL_table,
                .enable_time_us = 2200,
        },
        {
@@@ -1026,7 -1033,7 +1033,7 @@@ static inline struct tps65910_board *tp
  }
  #endif
  
 -static __devinit int tps65910_probe(struct platform_device *pdev)
 +static int tps65910_probe(struct platform_device *pdev)
  {
        struct tps65910 *tps65910 = dev_get_drvdata(pdev->dev.parent);
        struct regulator_config config = { };
@@@ -1184,7 -1191,7 +1191,7 @@@ err_unregister_regulator
        return err;
  }
  
 -static int __devexit tps65910_remove(struct platform_device *pdev)
 +static int tps65910_remove(struct platform_device *pdev)
  {
        struct tps65910_reg *pmic = platform_get_drvdata(pdev);
        int i;
@@@ -1231,7 -1238,7 +1238,7 @@@ static struct platform_driver tps65910_
                .owner = THIS_MODULE,
        },
        .probe = tps65910_probe,
 -      .remove = __devexit_p(tps65910_remove),
 +      .remove = tps65910_remove,
        .shutdown = tps65910_shutdown,
  };