Merge remote-tracking branches 'regulator/topic/s2mps11', 'regulator/topic/s5m8767...

diff --combined drivers/regulator/s2mps11.c
index 9e61922,39fbe6a,9e61922,333677d,333677d,333677d,333677d,333677d,333677d..d9e5579
--- 1/drivers/regulator/s2mps11.c
--- 2/drivers/regulator/s2mps11.c
--- 3/drivers/regulator/s2mps11.c
--- 4/drivers/regulator/s2mps11.c
--- 5/drivers/regulator/s2mps11.c
--- 6/drivers/regulator/s2mps11.c
--- 7/drivers/regulator/s2mps11.c
--- 8/drivers/regulator/s2mps11.c
--- 9/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@@@@@@@@@ -70,8 -70,6 -70,8 -70,8 -70,8 -70,8 -70,8 -70,8 -70,8 +70,6 @@@@@@@@@@ static int s2mps11_regulator_set_voltag
                        ramp_delay = s2mps11->ramp_delay2;
                        break;
                case S2MPS11_BUCK3:
- -------               ramp_delay = s2mps11->ramp_delay34;
- -------               break;
                case S2MPS11_BUCK4:
                        ramp_delay = s2mps11->ramp_delay34;
                        break;
@@@@@@@@@@ -438,7 -436,7 -438,7 -438,7 -438,7 -438,7 -438,7 -438,7 -438,7 +436,7 @@@@@@@@@@ common_reg
                platform_set_drvdata(pdev, s2mps11);
         
                config.dev = &pdev->dev;
 - ------       config.regmap = iodev->regmap;
 + ++++++       config.regmap = iodev->regmap_pmic;
                config.driver_data = s2mps11;
                for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) {
                        if (!reg_np) {