Merge remote-tracking branches 'regulator/topic/max77686', 'regulator/topic/max77693...

diff --cc drivers/regulator/anatop-regulator.c
Simple merge

diff --cc drivers/regulator/arizona-ldo1.c
index 559e7ea,4c9db58,4c9db58,b1eea7f,4c9db58,4c9db58..d071b21
--- 1/drivers/regulator/arizona-ldo1.c
--- 2/drivers/regulator/arizona-ldo1.c
--- 3/drivers/regulator/arizona-ldo1.c
--- 4/drivers/regulator/arizona-ldo1.c
--- 5/drivers/regulator/arizona-ldo1.c
--- 6/drivers/regulator/arizona-ldo1.c
+++ b/drivers/regulator/arizona-ldo1.c
@@@@@@@ -257,11 -257,9 -257,9 -259,9 -257,9 -257,9 +259,11 @@@@@@@ static int arizona_ldo1_probe(struct pl
      
        if (IS_ENABLED(CONFIG_OF)) {
                if (!dev_get_platdata(arizona->dev)) {
--- --                  ret = arizona_ldo1_of_get_pdata(arizona, &config);
+++ ++                  ret = arizona_ldo1_of_get_pdata(arizona, &config, desc);
                        if (ret < 0)
                                return ret;
 +++++
 +++++                  config.ena_gpio_initialized = true;
                }
        }
      

diff --cc drivers/regulator/fixed.c
Simple merge

diff --cc drivers/regulator/gpio-regulator.c
Simple merge

diff --cc drivers/regulator/max77693.c
Simple merge

diff --cc drivers/regulator/max8952.c
Simple merge

diff --cc drivers/regulator/rk808-regulator.c
Simple merge

diff --cc drivers/regulator/s5m8767.c
Simple merge

diff --cc include/linux/of.h
Simple merge

diff --cc include/linux/regulator/driver.h
Simple merge