regulator: arizona: Split KConfig options for LDO1 and MICSUPP regulators

[karo-tx-linux.git] / drivers / regulator / arizona-ldo1.c

diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c
index e76d094591e72bd1813d4d43f776644c0e314b3f..b726fa17f7b2f848271d21ac3d572c97fdd0ffbd 100644 (file)
--- a/drivers/regulator/arizona-ldo1.c
+++ b/drivers/regulator/arizona-ldo1.c
@@ -186,7 +186,8 @@ static const struct regulator_init_data arizona_ldo1_wm5110 = {
        .num_consumer_supplies = 1,
 };
 
-static int arizona_ldo1_of_get_pdata(struct arizona *arizona,
+static int arizona_ldo1_of_get_pdata(struct device *dev,
+                                    struct arizona *arizona,
                                     struct regulator_config *config,
                                     const struct regulator_desc *desc)
 {
@@ -212,8 +213,7 @@ static int arizona_ldo1_of_get_pdata(struct arizona *arizona,
        if (init_node) {
                config->of_node = init_node;
 
-               init_data = of_get_regulator_init_data(arizona->dev, init_node,
-                                                      desc);
+               init_data = of_get_regulator_init_data(dev, init_node, desc);
 
                if (init_data) {
                        init_data->consumer_supplies = &ldo1->supply;
@@ -283,7 +283,8 @@ static int arizona_ldo1_probe(struct platform_device *pdev)
 
        if (IS_ENABLED(CONFIG_OF)) {
                if (!dev_get_platdata(arizona->dev)) {
-                       ret = arizona_ldo1_of_get_pdata(arizona, &config, desc);
+                       ret = arizona_ldo1_of_get_pdata(&pdev->dev, arizona,
+                                                       &config, desc);
                        if (ret < 0)
                                return ret;
                }