Signed-off-by: Gyungoh Yoo <jack.yoo@xxxxxxxxxxxxxxx> --- Changes v4: Removed MODULE_VERSION() Modified license to GPLv2 Changes v3: Modified to return ENODATA when of_node is NULL Modified the messages in error cases Changes v2: Added 'compatible' attribute in the driver Added message for exception or errors. drivers/regulator/Kconfig | 2 +- drivers/regulator/sky81452-regulator.c | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 55d7b7b..fe84bd4 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -547,7 +547,7 @@ config REGULATOR_S5M8767 config REGULATOR_SKY81452 tristate "Skyworks Solutions SKY81452 voltage regulator" - depends on SKY81452 + depends on MFD_SKY81452 help This driver supports Skyworks SKY81452 voltage output regulator via I2C bus. SKY81452 has one voltage linear regulator can be diff --git a/drivers/regulator/sky81452-regulator.c b/drivers/regulator/sky81452-regulator.c index 97aff0c..dfdefdb 100644 --- a/drivers/regulator/sky81452-regulator.c +++ b/drivers/regulator/sky81452-regulator.c @@ -68,12 +68,11 @@ static const struct regulator_desc sky81452_reg = { static struct regulator_init_data *sky81452_reg_parse_dt(struct device *dev) { struct regulator_init_data *init_data; - struct device_node *np; + struct device_node *np = of_node_get(dev->of_node); - np = of_get_child_by_name(dev->parent->of_node, "regulator"); - if (unlikely(!np)) { + if (!np) { dev_err(dev, "regulator node not found"); - return NULL; + return ERR_PTR(-ENODATA); } init_data = of_get_regulator_init_data(dev, np); @@ -107,17 +106,28 @@ static int sky81452_reg_probe(struct platform_device *pdev) config.regmap = dev_get_drvdata(dev->parent); rdev = devm_regulator_register(dev, &sky81452_reg, &config); - if (IS_ERR(rdev)) + if (IS_ERR(rdev)) { + dev_err(dev, "failed to register. err=%ld", PTR_ERR(rdev)); return PTR_ERR(rdev); + } platform_set_drvdata(pdev, rdev); return 0; } +#ifdef CONFIG_OF +static const struct of_device_id sky81452_reg_of_match[] = { + { .compatible = "skyworks,sky81452-regulator", }, + { } +}; +MODULE_DEVICE_TABLE(of, sky81452_reg_of_match); +#endif + static struct platform_driver sky81452_reg_driver = { .driver = { .name = "sky81452-regulator", + .of_match_table = of_match_ptr(sky81452_reg_of_match), }, .probe = sky81452_reg_probe, }; @@ -126,5 +136,4 @@ module_platform_driver(sky81452_reg_driver); MODULE_DESCRIPTION("Skyworks SKY81452 Regulator driver"); MODULE_AUTHOR("Gyungoh Yoo <jack.yoo@xxxxxxxxxxxxxxx>"); -MODULE_LICENSE("GPL"); -MODULE_VERSION("1.0"); +MODULE_LICENSE("GPL v2"); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html