Merge remote-tracking branches 'regulator/topic/arizona', 'regulator/topic/bypass...

diff --combined drivers/regulator/core.c
index ee13c47addf1b76cb96917c63739d2cb1ff096a1,67426c0477d34b2b5805826664bbc4074acfe591,67426c0477d34b2b5805826664bbc4074acfe591,08260c215895f992f356e3897579daa8b109025b,08260c215895f992f356e3897579daa8b109025b..04baac9a165bbb56da292a51d0a56055947861e0
--- 1/drivers/regulator/core.c
--- 2/drivers/regulator/core.c
--- 3/drivers/regulator/core.c
--- 4/drivers/regulator/core.c
--- 5/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@@@@ -204,7 -204,7 -204,7 -204,7 -204,7 +204,7 @@@@@@ static struct device_node *of_get_regul
        regnode = of_parse_phandle(dev->of_node, prop_name, 0);
     
        if (!regnode) {
 ----           dev_dbg(dev, "Looking up %s property in node %s failed",
 ++++           dev_dbg(dev, "Looking up %s property in node %s failed\n",
                                prop_name, dev->of_node->full_name);
                return NULL;
        }
@@@@@@ -293,8 -293,7 -293,7 -293,7 -293,7 +293,8 @@@@@@ static int regulator_check_current_limi
     }
     
     /* operating mode constraint check */
 ----static int regulator_mode_constrain(struct regulator_dev *rdev, int *mode)
 ++++static int regulator_mode_constrain(struct regulator_dev *rdev,
 ++++                               unsigned int *mode)
     {
        switch (*mode) {
        case REGULATOR_MODE_FAST:
@@@@@@ -2755,7 -2754,7 -2754,7 -2754,7 -2754,7 +2755,7 @@@@@@ static int _regulator_set_voltage_time(
                ramp_delay = rdev->desc->ramp_delay;
     
        if (ramp_delay == 0) {
 ----           rdev_warn(rdev, "ramp_delay not set\n");
 ++++           rdev_dbg(rdev, "ramp_delay not set\n");
                return 0;
        }
     
@@@@@@ -3360,6 -3359,6 -3359,6 -3359,39 -3359,39 +3360,39 @@@@@@ unsigned int regulator_get_mode(struct 
     }
     EXPORT_SYMBOL_GPL(regulator_get_mode);
     
+++  static int _regulator_get_error_flags(struct regulator_dev *rdev,
+++                                     unsigned int *flags)
+++  {
+++     int ret;
+++  
+++     mutex_lock(&rdev->mutex);
+++  
+++     /* sanity check */
+++     if (!rdev->desc->ops->get_error_flags) {
+++             ret = -EINVAL;
+++             goto out;
+++     }
+++  
+++     ret = rdev->desc->ops->get_error_flags(rdev, flags);
+++  out:
+++     mutex_unlock(&rdev->mutex);
+++     return ret;
+++  }
+++  
+++  /**
+++   * regulator_get_error_flags - get regulator error information
+++   * @regulator: regulator source
+++   * @flags: pointer to store error flags
+++   *
+++   * Get the current regulator error information.
+++   */
+++  int regulator_get_error_flags(struct regulator *regulator,
+++                             unsigned int *flags)
+++  {
+++     return _regulator_get_error_flags(regulator->rdev, flags);
+++  }
+++  EXPORT_SYMBOL_GPL(regulator_get_error_flags);
+++  
     /**
      * regulator_set_load - set regulator load
      * @regulator: regulator source