From 416d67599e744bcaef4a5ac45d263a630351b778 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Fri, 22 Mar 2013 17:15:48 +0100 Subject: regulator: as3711: add OF support AS3711 regulator OF support only evaluates standard regulator DT properties. Signed-off-by: Guennadi Liakhovetski Reviwed-by: Mark Brown Signed-off-by: Mark Brown --- drivers/regulator/as3711-regulator.c | 74 ++++++++++++++++++++++++++++++++++-- 1 file changed, 71 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/as3711-regulator.c b/drivers/regulator/as3711-regulator.c index f0ba8c4eefa9..0539b3e8f83b 100644 --- a/drivers/regulator/as3711-regulator.c +++ b/drivers/regulator/as3711-regulator.c @@ -13,9 +13,11 @@ #include #include #include +#include #include #include #include +#include #include struct as3711_regulator_info { @@ -276,6 +278,60 @@ static struct as3711_regulator_info as3711_reg_info[] = { #define AS3711_REGULATOR_NUM ARRAY_SIZE(as3711_reg_info) +static const char *as3711_regulator_of_names[AS3711_REGULATOR_NUM] = { + [AS3711_REGULATOR_SD_1] = "sd1", + [AS3711_REGULATOR_SD_2] = "sd2", + [AS3711_REGULATOR_SD_3] = "sd3", + [AS3711_REGULATOR_SD_4] = "sd4", + [AS3711_REGULATOR_LDO_1] = "ldo1", + [AS3711_REGULATOR_LDO_2] = "ldo2", + [AS3711_REGULATOR_LDO_3] = "ldo3", + [AS3711_REGULATOR_LDO_4] = "ldo4", + [AS3711_REGULATOR_LDO_5] = "ldo5", + [AS3711_REGULATOR_LDO_6] = "ldo6", + [AS3711_REGULATOR_LDO_7] = "ldo7", + [AS3711_REGULATOR_LDO_8] = "ldo8", +}; + +static int as3711_regulator_parse_dt(struct device *dev, + struct device_node **of_node, const int count) +{ + struct as3711_regulator_pdata *pdata = dev_get_platdata(dev); + struct device_node *regulators = + of_find_node_by_name(dev->parent->of_node, "regulators"); + struct of_regulator_match *matches, *match; + int ret, i; + + if (!regulators) { + dev_err(dev, "regulator node not found\n"); + return -ENODEV; + } + + matches = devm_kzalloc(dev, sizeof(*matches) * count, GFP_KERNEL); + if (!matches) + return -ENOMEM; + + for (i = 0, match = matches; i < count; i++, match++) { + match->name = as3711_regulator_of_names[i]; + match->driver_data = as3711_reg_info + i; + } + + ret = of_regulator_match(dev->parent, regulators, matches, count); + of_node_put(regulators); + if (ret < 0) { + dev_err(dev, "Error parsing regulator init data: %d\n", ret); + return ret; + } + + for (i = 0, match = matches; i < count; i++, match++) + if (match->of_node) { + pdata->init_data[i] = match->init_data; + of_node[i] = match->of_node; + } + + return 0; +} + static int as3711_regulator_probe(struct platform_device *pdev) { struct as3711_regulator_pdata *pdata = dev_get_platdata(&pdev->dev); @@ -284,13 +340,24 @@ static int as3711_regulator_probe(struct platform_device *pdev) struct regulator_config config = {.dev = &pdev->dev,}; struct as3711_regulator *reg = NULL; struct as3711_regulator *regs; + struct device_node *of_node[AS3711_REGULATOR_NUM] = {}; struct regulator_dev *rdev; struct as3711_regulator_info *ri; int ret; int id; - if (!pdata) - dev_dbg(&pdev->dev, "No platform data...\n"); + if (!pdata) { + dev_err(&pdev->dev, "No platform data...\n"); + return -ENODEV; + } + + if (pdev->dev.parent->of_node) { + ret = as3711_regulator_parse_dt(&pdev->dev, of_node, AS3711_REGULATOR_NUM); + if (ret < 0) { + dev_err(&pdev->dev, "DT parsing failed: %d\n", ret); + return ret; + } + } regs = devm_kzalloc(&pdev->dev, AS3711_REGULATOR_NUM * sizeof(struct as3711_regulator), GFP_KERNEL); @@ -300,7 +367,7 @@ static int as3711_regulator_probe(struct platform_device *pdev) } for (id = 0, ri = as3711_reg_info; id < AS3711_REGULATOR_NUM; ++id, ri++) { - reg_data = pdata ? pdata->init_data[id] : NULL; + reg_data = pdata->init_data[id]; /* No need to register if there is no regulator data */ if (!reg_data) @@ -312,6 +379,7 @@ static int as3711_regulator_probe(struct platform_device *pdev) config.init_data = reg_data; config.driver_data = reg; config.regmap = as3711->regmap; + config.of_node = of_node[id]; rdev = regulator_register(&ri->desc, &config); if (IS_ERR(rdev)) { -- cgit v1.2.3 From d6c7d73192052eb90e782c626ecaf328c7e9bc6e Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 17 Apr 2013 16:01:22 +0800 Subject: regulator: as3711: Use a static of_regulator_match table for of_regulator_match The same table can be used for multiple instance of pdev, so we don't need to allocate memory for of_regulator_match table per pdev. match->driver_data points to the corresponding entry of as3711_reg_info, however it is not used in current code, thus this patch does not set driver_data in the of_regulator_match table. Signed-off-by: Axel Lin Acked-by: Guennadi Liakhovetski Signed-off-by: Mark Brown --- drivers/regulator/as3711-regulator.c | 43 +++++++++++++++--------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/drivers/regulator/as3711-regulator.c b/drivers/regulator/as3711-regulator.c index 0539b3e8f83b..3da6bd6950cf 100644 --- a/drivers/regulator/as3711-regulator.c +++ b/drivers/regulator/as3711-regulator.c @@ -278,19 +278,20 @@ static struct as3711_regulator_info as3711_reg_info[] = { #define AS3711_REGULATOR_NUM ARRAY_SIZE(as3711_reg_info) -static const char *as3711_regulator_of_names[AS3711_REGULATOR_NUM] = { - [AS3711_REGULATOR_SD_1] = "sd1", - [AS3711_REGULATOR_SD_2] = "sd2", - [AS3711_REGULATOR_SD_3] = "sd3", - [AS3711_REGULATOR_SD_4] = "sd4", - [AS3711_REGULATOR_LDO_1] = "ldo1", - [AS3711_REGULATOR_LDO_2] = "ldo2", - [AS3711_REGULATOR_LDO_3] = "ldo3", - [AS3711_REGULATOR_LDO_4] = "ldo4", - [AS3711_REGULATOR_LDO_5] = "ldo5", - [AS3711_REGULATOR_LDO_6] = "ldo6", - [AS3711_REGULATOR_LDO_7] = "ldo7", - [AS3711_REGULATOR_LDO_8] = "ldo8", +static struct of_regulator_match +as3711_regulator_matches[AS3711_REGULATOR_NUM] = { + [AS3711_REGULATOR_SD_1] = { .name = "sd1" }, + [AS3711_REGULATOR_SD_2] = { .name = "sd2" }, + [AS3711_REGULATOR_SD_3] = { .name = "sd3" }, + [AS3711_REGULATOR_SD_4] = { .name = "sd4" }, + [AS3711_REGULATOR_LDO_1] = { .name = "ldo1" }, + [AS3711_REGULATOR_LDO_2] = { .name = "ldo2" }, + [AS3711_REGULATOR_LDO_3] = { .name = "ldo3" }, + [AS3711_REGULATOR_LDO_4] = { .name = "ldo4" }, + [AS3711_REGULATOR_LDO_5] = { .name = "ldo5" }, + [AS3711_REGULATOR_LDO_6] = { .name = "ldo6" }, + [AS3711_REGULATOR_LDO_7] = { .name = "ldo7" }, + [AS3711_REGULATOR_LDO_8] = { .name = "ldo8" }, }; static int as3711_regulator_parse_dt(struct device *dev, @@ -299,7 +300,7 @@ static int as3711_regulator_parse_dt(struct device *dev, struct as3711_regulator_pdata *pdata = dev_get_platdata(dev); struct device_node *regulators = of_find_node_by_name(dev->parent->of_node, "regulators"); - struct of_regulator_match *matches, *match; + struct of_regulator_match *match; int ret, i; if (!regulators) { @@ -307,23 +308,15 @@ static int as3711_regulator_parse_dt(struct device *dev, return -ENODEV; } - matches = devm_kzalloc(dev, sizeof(*matches) * count, GFP_KERNEL); - if (!matches) - return -ENOMEM; - - for (i = 0, match = matches; i < count; i++, match++) { - match->name = as3711_regulator_of_names[i]; - match->driver_data = as3711_reg_info + i; - } - - ret = of_regulator_match(dev->parent, regulators, matches, count); + ret = of_regulator_match(dev->parent, regulators, + as3711_regulator_matches, count); of_node_put(regulators); if (ret < 0) { dev_err(dev, "Error parsing regulator init data: %d\n", ret); return ret; } - for (i = 0, match = matches; i < count; i++, match++) + for (i = 0, match = as3711_regulator_matches; i < count; i++, match++) if (match->of_node) { pdata->init_data[i] = match->init_data; of_node[i] = match->of_node; -- cgit v1.2.3