diff options
| author | Lee Jones <lee.jones@linaro.org> | 2020-11-19 09:33:45 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2020-11-19 09:33:45 +0100 |
| commit | f8d86e2998e91d5a9f62b4934445d1ecadd00b30 (patch) | |
| tree | c2f4ab9d98225306affb6790c9205f2b8f877d5a /drivers/mfd | |
| parent | platform/x86: Intel PMT Crashlog capability driver (diff) | |
| parent | mfd: syscon: Add syscon_regmap_lookup_by_phandle_optional() function. (diff) | |
| download | linux-f8d86e2998e91d5a9f62b4934445d1ecadd00b30.tar.xz linux-f8d86e2998e91d5a9f62b4934445d1ecadd00b30.zip | |
Merge branch 'ib-mfd-mediatek-5.11' into ibs-for-mfd-merged
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/syscon.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c index ca465794ea9c..c6f139b2e0c0 100644 --- a/drivers/mfd/syscon.c +++ b/drivers/mfd/syscon.c @@ -255,6 +255,24 @@ struct regmap *syscon_regmap_lookup_by_phandle_args(struct device_node *np, } EXPORT_SYMBOL_GPL(syscon_regmap_lookup_by_phandle_args); +/* + * It behaves the same as syscon_regmap_lookup_by_phandle() except where + * there is no regmap phandle. In this case, instead of returning -ENODEV, + * the function returns NULL. + */ +struct regmap *syscon_regmap_lookup_by_phandle_optional(struct device_node *np, + const char *property) +{ + struct regmap *regmap; + + regmap = syscon_regmap_lookup_by_phandle(np, property); + if (IS_ERR(regmap) && PTR_ERR(regmap) == -ENODEV) + return NULL; + + return regmap; +} +EXPORT_SYMBOL_GPL(syscon_regmap_lookup_by_phandle_optional); + static int syscon_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; |