Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / regulator / tps6105x-regulator.c

diff --git a/drivers/regulator/tps6105x-regulator.c b/drivers/regulator/tps6105x-regulator.c
index 06059a94f7c658df3ea98451e6ef78aad685e469..f8939af0bd2ce3af1ceb72d44b2c5fbd18c2f3e2 100644 (file)
--- a/drivers/regulator/tps6105x-regulator.c
+++ b/drivers/regulator/tps6105x-regulator.c
@@ -37,6 +37,7 @@ static struct regulator_ops tps6105x_regulator_ops = {
 
 static const struct regulator_desc tps6105x_regulator_desc = {
        .name           = "tps6105x-boost",
+       .of_match       = of_match_ptr("regulator"),
        .ops            = &tps6105x_regulator_ops,
        .type           = REGULATOR_VOLTAGE,
        .id             = 0,
@@ -71,6 +72,7 @@ static int tps6105x_regulator_probe(struct platform_device *pdev)
        config.dev = &tps6105x->client->dev;
        config.init_data = pdata->regulator_data;
        config.driver_data = tps6105x;
+       config.of_node = pdev->dev.parent->of_node;
        config.regmap = tps6105x->regmap;
 
        /* Register regulator with framework */