| Message ID | 20191028152050.10220-1-s.nawrocki@samsung.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/3] soc: samsung: Drop "syscon" compatible requirement from the chipid driver | expand |
On Mon, Oct 28, 2019 at 04:20:48PM +0100, Sylwester Nawrocki wrote: > As we dropped the requirement of "syscon" compatible in the chipid > nodes rework code acquiring the regmap to use device_node_to_regmap() > rather than syscon_node_to_regmap(). > > Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> > --- > drivers/soc/samsung/exynos-chipid.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) Thanks, applied. Best regards, Krzysztof
diff --git a/drivers/soc/samsung/exynos-chipid.c b/drivers/soc/samsung/exynos-chipid.c index 25562dd0b206..b89c26a71c6e 100644 --- a/drivers/soc/samsung/exynos-chipid.c +++ b/drivers/soc/samsung/exynos-chipid.c @@ -50,12 +50,20 @@ static int __init exynos_chipid_early_init(void) struct soc_device_attribute *soc_dev_attr; struct soc_device *soc_dev; struct device_node *root; + struct device_node *syscon; struct regmap *regmap; u32 product_id; u32 revision; int ret; - regmap = syscon_regmap_lookup_by_compatible("samsung,exynos4210-chipid"); + syscon = of_find_compatible_node(NULL, NULL, + "samsung,exynos4210-chipid"); + if (!syscon) + return ENODEV; + + regmap = device_node_to_regmap(syscon); + of_node_put(syscon); + if (IS_ERR(regmap)) return PTR_ERR(regmap);
As we dropped the requirement of "syscon" compatible in the chipid nodes rework code acquiring the regmap to use device_node_to_regmap() rather than syscon_node_to_regmap(). Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> --- drivers/soc/samsung/exynos-chipid.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)