Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: sprd: support to get regmap from parent node

Some SC9863a clock nodes would be the child of a syscon node, clocks can
use the regmap of syscon device directly for this kind of cases.

Signed-off-by: Chunyan Zhang <chunyan.zhang@unisoc.com>
Link: https://lkml.kernel.org/r/20200304072730.9193-7-zhang.lyra@gmail.com
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

authored by

Chunyan Zhang and committed by
Stephen Boyd
f95e8c79 ea8ca310

+9 -1
+9 -1
drivers/clk/sprd/common.c
··· 40 40 const struct sprd_clk_desc *desc) 41 41 { 42 42 void __iomem *base; 43 - struct device_node *node = pdev->dev.of_node; 43 + struct device *dev = &pdev->dev; 44 + struct device_node *node = dev->of_node; 44 45 struct regmap *regmap; 45 46 46 47 if (of_find_property(node, "sprd,syscon", NULL)) { 47 48 regmap = syscon_regmap_lookup_by_phandle(node, "sprd,syscon"); 48 49 if (IS_ERR(regmap)) { 49 50 pr_err("%s: failed to get syscon regmap\n", __func__); 51 + return PTR_ERR(regmap); 52 + } 53 + } else if (of_device_is_compatible(of_get_parent(dev->of_node), 54 + "syscon")) { 55 + regmap = device_node_to_regmap(of_get_parent(dev->of_node)); 56 + if (IS_ERR(regmap)) { 57 + dev_err(dev, "failed to get regmap from its parent.\n"); 50 58 return PTR_ERR(regmap); 51 59 } 52 60 } else {