1 From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2 Date: Fri, 03 Apr 2020 19:50:03 +0200
3 Subject: add removed helper syscon_regmap_lookup_by_pdevname
5 The helper syscon_regmap_lookup_by_pdevname has been removed in 29d14b668d2f
6 ("mfd: Remove unused helper syscon_regmap_lookup_by_pdevname") due to lack
9 Thus, we have to maintain it locally.
11 This patch includes a fix due to changes in driver_find_device;
12 kernel commit: 92ce7e83b4e5 ("driver_find_device: Unify the match function
13 with class_find_device()")
15 Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
17 --- a/drivers/mfd/syscon.c
18 +++ b/drivers/mfd/syscon.c
19 @@ -205,6 +205,27 @@ struct regmap *syscon_regmap_lookup_by_c
21 EXPORT_SYMBOL_GPL(syscon_regmap_lookup_by_compatible);
23 +static int syscon_match_pdevname(struct device *dev, const void *data)
25 + return !strcmp(dev_name(dev), (const char *)data);
28 +struct regmap *syscon_regmap_lookup_by_pdevname(const char *s)
31 + struct syscon *syscon;
33 + dev = driver_find_device(&syscon_driver.driver, NULL, (void *)s,
34 + syscon_match_pdevname);
36 + return ERR_PTR(-EPROBE_DEFER);
38 + syscon = dev_get_drvdata(dev);
40 + return syscon->regmap;
42 +EXPORT_SYMBOL_GPL(syscon_regmap_lookup_by_pdevname);
44 struct regmap *syscon_regmap_lookup_by_phandle(struct device_node *np,
47 --- a/include/linux/mfd/syscon.h
48 +++ b/include/linux/mfd/syscon.h
49 @@ -20,6 +20,7 @@ struct device_node;
50 extern struct regmap *device_node_to_regmap(struct device_node *np);
51 extern struct regmap *syscon_node_to_regmap(struct device_node *np);
52 extern struct regmap *syscon_regmap_lookup_by_compatible(const char *s);
53 +extern struct regmap *syscon_regmap_lookup_by_pdevname(const char *s);
54 extern struct regmap *syscon_regmap_lookup_by_phandle(
55 struct device_node *np,
56 const char *property);
57 @@ -46,6 +47,11 @@ static inline struct regmap *syscon_regm
59 return ERR_PTR(-ENOTSUPP);
62 +static inline struct regmap *syscon_regmap_lookup_by_pdevname(const char *s)
64 + return ERR_PTR(-ENOTSUPP);
67 static inline struct regmap *syscon_regmap_lookup_by_phandle(
68 struct device_node *np,