| .. | .. |
|---|
| 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, *np; |
|---|
| 44 | 45 | struct regmap *regmap; |
|---|
| 45 | 46 | |
|---|
| 46 | 47 | if (of_find_property(node, "sprd,syscon", NULL)) { |
|---|
| .. | .. |
|---|
| 49 | 50 | pr_err("%s: failed to get syscon regmap\n", __func__); |
|---|
| 50 | 51 | return PTR_ERR(regmap); |
|---|
| 51 | 52 | } |
|---|
| 53 | + } else if (of_device_is_compatible(np = of_get_parent(node), "syscon") || |
|---|
| 54 | + (of_node_put(np), 0)) { |
|---|
| 55 | + regmap = device_node_to_regmap(np); |
|---|
| 56 | + of_node_put(np); |
|---|
| 57 | + if (IS_ERR(regmap)) { |
|---|
| 58 | + dev_err(dev, "failed to get regmap from its parent.\n"); |
|---|
| 59 | + return PTR_ERR(regmap); |
|---|
| 60 | + } |
|---|
| 52 | 61 | } else { |
|---|
| 53 | | - base = of_iomap(node, 0); |
|---|
| 62 | + base = devm_platform_ioremap_resource(pdev, 0); |
|---|
| 63 | + if (IS_ERR(base)) |
|---|
| 64 | + return PTR_ERR(base); |
|---|
| 65 | + |
|---|
| 54 | 66 | regmap = devm_regmap_init_mmio(&pdev->dev, base, |
|---|
| 55 | 67 | &sprdclk_regmap_config); |
|---|
| 56 | | - if (IS_ERR_OR_NULL(regmap)) { |
|---|
| 68 | + if (IS_ERR(regmap)) { |
|---|
| 57 | 69 | pr_err("failed to init regmap\n"); |
|---|
| 58 | 70 | return PTR_ERR(regmap); |
|---|
| 59 | 71 | } |
|---|