diff options
| author | Matthias Brugger <matthias.bgg@gmail.com> | 2020-11-27 12:04:26 +0100 |
|---|---|---|
| committer | Matthias Brugger <matthias.bgg@gmail.com> | 2020-11-27 12:04:26 +0100 |
| commit | 63e5dcc03369602ec5c8165febfb64c37eb37b39 (patch) | |
| tree | a405208eb5d0d1ceff3a1e79e0fc474d66d94f94 /include/linux | |
| parent | cc7a16b14f386a9f67ba16195dfb85d2a9f3a007 (diff) | |
| parent | 86b9d170da98bae13b307d621638954aef645331 (diff) | |
Merge tag 'ib-mfd-mediatek-v5.11' into HEAD
Immutable branch between MFD and MediaTek due for the v5.11 merge window
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/syscon.h | 11 |
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__ */ |