aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Porter <mporter@linaro.org>2014-03-07 23:24:31 -0500
committerMatt Porter <mporter@linaro.org>2014-03-07 23:24:31 -0500
commita95f1658e9a94fca9729192278d40c3abcb9404d (patch)
treeb30672a0f9da5187aaaeb13c65eb33b0cd7a9be6
parent6fa60b700b01c843df4f05ca160077b1316dded8 (diff)
remove subdevice of match in favor of a mfd platform device match and reference to parent of node
Signed-off-by: Matt Porter <mporter@linaro.org>
-rw-r--r--drivers/regulator/bcm590xx-regulator.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/regulator/bcm590xx-regulator.c b/drivers/regulator/bcm590xx-regulator.c
index 58fcc3a10c3..e6b2e8e08c4 100644
--- a/drivers/regulator/bcm590xx-regulator.c
+++ b/drivers/regulator/bcm590xx-regulator.c
@@ -250,7 +250,7 @@ static struct bcm590xx_board *bcm590xx_parse_dt_reg_data(
struct of_regulator_match **bcm590xx_reg_matches)
{
struct bcm590xx_board *data;
- struct device_node *np = pdev->dev.of_node;
+ struct device_node *np = pdev->dev.parent->of_node;
struct device_node *regulators;
struct of_regulator_match *matches = bcm590xx_matches;
int count = ARRAY_SIZE(bcm590xx_matches);
@@ -398,15 +398,9 @@ static int bcm590xx_probe(struct platform_device *pdev)
return 0;
}
-static struct of_device_id bcm590xx_of_match[] = {
- { .compatible = "brcm,bcm59056-regs", },
- { }
-};
-
static struct platform_driver bcm590xx_regulator_driver = {
.driver = {
- .name = "bcm590xx-regs",
- .of_match_table = bcm590xx_of_match,
+ .name = "bcm590xx-vregs",
.owner = THIS_MODULE,
},
.probe = bcm590xx_probe,