aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorPaul Burton <[email protected]>2019-08-08 15:33:16 -0700
committerPaul Burton <[email protected]>2019-08-08 15:33:16 -0700
commit75b7329a4f08b3d2566afa25cfaddc8ddfb6dfa1 (patch)
tree17a4e177a2a245af450827330eef0f39f16be3cf /include/linux
parent6393e60644862478a9da8c6599ffc04f7f94bedf (diff)
parentabc552284f6b1e8e6f153771dac1dff72e9d6d66 (diff)
Merge branch 'ingenic-tcu-v5.4' into mips-next
Merge the Ingenic TCU patchset from the ingenic-tcu-v5.4 branch which was created to enable follow-on changes in other subsystems. Signed-off-by: Paul Burton <[email protected]>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mfd/syscon.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/mfd/syscon.h b/include/linux/mfd/syscon.h
index 8cfda0554381..112dc66262cc 100644
--- a/include/linux/mfd/syscon.h
+++ b/include/linux/mfd/syscon.h
@@ -17,12 +17,18 @@
struct device_node;
#ifdef CONFIG_MFD_SYSCON
+extern struct regmap *device_node_to_regmap(struct device_node *np);
extern struct regmap *syscon_node_to_regmap(struct device_node *np);
extern struct regmap *syscon_regmap_lookup_by_compatible(const char *s);
extern struct regmap *syscon_regmap_lookup_by_phandle(
struct device_node *np,
const char *property);
#else
+static inline struct regmap *device_node_to_regmap(struct device_node *np)
+{
+ return ERR_PTR(-ENOTSUPP);
+}
+
static inline struct regmap *syscon_node_to_regmap(struct device_node *np)
{
return ERR_PTR(-ENOTSUPP);