summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2020-11-19 08:33:45 +0000
committerLee Jones <lee.jones@linaro.org>2020-11-19 08:33:45 +0000
commitf8d86e2998e91d5a9f62b4934445d1ecadd00b30 (patch)
treec2f4ab9d98225306affb6790c9205f2b8f877d5a /include
parent5ef9998c96b0c99c49c202054586967e609286d2 (diff)
parent86b9d170da98bae13b307d621638954aef645331 (diff)
Merge branch 'ib-mfd-mediatek-5.11' into ibs-for-mfd-merged
Diffstat (limited to 'include')
-rw-r--r--include/linux/mfd/syscon.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/mfd/syscon.h b/include/linux/mfd/syscon.h
index 7f20e9b502a5..fecc2fa2a364 100644
--- a/include/linux/mfd/syscon.h
+++ b/include/linux/mfd/syscon.h
@@ -28,6 +28,9 @@ extern struct regmap *syscon_regmap_lookup_by_phandle_args(
const char *property,
int arg_count,
unsigned int *out_args);
+extern struct regmap *syscon_regmap_lookup_by_phandle_optional(
+ struct device_node *np,
+ const char *property);
#else
static inline struct regmap *device_node_to_regmap(struct device_node *np)
{
@@ -59,6 +62,14 @@ static inline struct regmap *syscon_regmap_lookup_by_phandle_args(
{
return ERR_PTR(-ENOTSUPP);
}
+
+static inline struct regmap *syscon_regmap_lookup_by_phandle_optional(
+ struct device_node *np,
+ const char *property)
+{
+ return NULL;
+}
+
#endif
#endif /* __LINUX_MFD_SYSCON_H__ */