.. | .. |
---|
17 | 17 | .reg_bits = 32, |
---|
18 | 18 | .reg_stride = 4, |
---|
19 | 19 | .val_bits = 32, |
---|
20 | | - .max_register = 0xffff, |
---|
21 | 20 | .fast_io = true, |
---|
22 | 21 | }; |
---|
23 | 22 | |
---|
.. | .. |
---|
40 | 39 | const struct sprd_clk_desc *desc) |
---|
41 | 40 | { |
---|
42 | 41 | void __iomem *base; |
---|
43 | | - struct device_node *node = pdev->dev.of_node; |
---|
| 42 | + struct device *dev = &pdev->dev; |
---|
| 43 | + struct device_node *node = dev->of_node, *np; |
---|
44 | 44 | struct regmap *regmap; |
---|
| 45 | + struct resource *res; |
---|
| 46 | + struct regmap_config reg_config = sprdclk_regmap_config; |
---|
45 | 47 | |
---|
46 | 48 | if (of_find_property(node, "sprd,syscon", NULL)) { |
---|
47 | 49 | regmap = syscon_regmap_lookup_by_phandle(node, "sprd,syscon"); |
---|
.. | .. |
---|
49 | 51 | pr_err("%s: failed to get syscon regmap\n", __func__); |
---|
50 | 52 | return PTR_ERR(regmap); |
---|
51 | 53 | } |
---|
| 54 | + } else if (of_device_is_compatible(np = of_get_parent(node), "syscon") || |
---|
| 55 | + (of_node_put(np), 0)) { |
---|
| 56 | + regmap = device_node_to_regmap(np); |
---|
| 57 | + of_node_put(np); |
---|
| 58 | + if (IS_ERR(regmap)) { |
---|
| 59 | + dev_err(dev, "failed to get regmap from its parent.\n"); |
---|
| 60 | + return PTR_ERR(regmap); |
---|
| 61 | + } |
---|
52 | 62 | } else { |
---|
53 | | - base = of_iomap(node, 0); |
---|
| 63 | + base = devm_platform_get_and_ioremap_resource(pdev, 0, &res); |
---|
| 64 | + if (IS_ERR(base)) |
---|
| 65 | + return PTR_ERR(base); |
---|
| 66 | + |
---|
| 67 | + reg_config.max_register = resource_size(res) - reg_config.reg_stride; |
---|
| 68 | + |
---|
54 | 69 | regmap = devm_regmap_init_mmio(&pdev->dev, base, |
---|
55 | | - &sprdclk_regmap_config); |
---|
56 | | - if (IS_ERR_OR_NULL(regmap)) { |
---|
| 70 | + ®_config); |
---|
| 71 | + if (IS_ERR(regmap)) { |
---|
57 | 72 | pr_err("failed to init regmap\n"); |
---|
58 | 73 | return PTR_ERR(regmap); |
---|
59 | 74 | } |
---|