Commit 35d6b98c authored by Peter Griffin's avatar Peter Griffin Committed by Lee Jones

soc: samsung: exynos-pmu: update to use of_syscon_register_regmap()

For SoCs like gs101 that need a special regmap, register this with
of_syscon_register_regmap api, so it can be returned by
syscon_regmap_lookup_by_phandle() and friends.

For SoCs that don't require a custom regmap, revert back to syscon
creating the mmio regmap rather than duplicating the logic here.

exynos_get_pmu_regmap_by_phandle() api is also updated to retrieve
the regmap via syscon. The exynos_get_pmu_regmap_by_phandle() api
is kept around until fw_devlink support for syscon property is added
for the pinctrl-samsung driver that also runs at postcore_initcall
level.

All other exynos client drivers can revert back to
syscon_regmap_lookup_by_phandle().
Signed-off-by: default avatarPeter Griffin <peter.griffin@linaro.org>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarSam Protsenko <semen.protsenko@linaro.org>
Tested-by: default avatarWill McVicker <willmcvicker@google.com>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240621115544.1655458-3-peter.griffin@linaro.orgSigned-off-by: default avatarLee Jones <lee@kernel.org>
parent 769cb631
...@@ -204,16 +204,6 @@ static const struct regmap_config regmap_smccfg = { ...@@ -204,16 +204,6 @@ static const struct regmap_config regmap_smccfg = {
.reg_update_bits = tensor_sec_update_bits, .reg_update_bits = tensor_sec_update_bits,
}; };
static const struct regmap_config regmap_mmiocfg = {
.name = "pmu_regs",
.reg_bits = 32,
.reg_stride = 4,
.val_bits = 32,
.fast_io = true,
.use_single_read = true,
.use_single_write = true,
};
static const struct exynos_pmu_data gs101_pmu_data = { static const struct exynos_pmu_data gs101_pmu_data = {
.pmu_secure = true .pmu_secure = true
}; };
...@@ -290,7 +280,6 @@ EXPORT_SYMBOL_GPL(exynos_get_pmu_regmap); ...@@ -290,7 +280,6 @@ EXPORT_SYMBOL_GPL(exynos_get_pmu_regmap);
struct regmap *exynos_get_pmu_regmap_by_phandle(struct device_node *np, struct regmap *exynos_get_pmu_regmap_by_phandle(struct device_node *np,
const char *propname) const char *propname)
{ {
struct exynos_pmu_context *ctx;
struct device_node *pmu_np; struct device_node *pmu_np;
struct device *dev; struct device *dev;
...@@ -316,9 +305,7 @@ struct regmap *exynos_get_pmu_regmap_by_phandle(struct device_node *np, ...@@ -316,9 +305,7 @@ struct regmap *exynos_get_pmu_regmap_by_phandle(struct device_node *np,
if (!dev) if (!dev)
return ERR_PTR(-EPROBE_DEFER); return ERR_PTR(-EPROBE_DEFER);
ctx = dev_get_drvdata(dev); return syscon_node_to_regmap(pmu_np);
return ctx->pmureg;
} }
EXPORT_SYMBOL_GPL(exynos_get_pmu_regmap_by_phandle); EXPORT_SYMBOL_GPL(exynos_get_pmu_regmap_by_phandle);
...@@ -355,19 +342,22 @@ static int exynos_pmu_probe(struct platform_device *pdev) ...@@ -355,19 +342,22 @@ static int exynos_pmu_probe(struct platform_device *pdev)
regmap = devm_regmap_init(dev, NULL, regmap = devm_regmap_init(dev, NULL,
(void *)(uintptr_t)res->start, (void *)(uintptr_t)res->start,
&pmu_regmcfg); &pmu_regmcfg);
if (IS_ERR(regmap))
return dev_err_probe(&pdev->dev, PTR_ERR(regmap),
"regmap init failed\n");
ret = of_syscon_register_regmap(dev->of_node, regmap);
if (ret)
return ret;
} else { } else {
/* All other SoCs use a MMIO regmap */ /* let syscon create mmio regmap */
pmu_regmcfg = regmap_mmiocfg; regmap = syscon_node_to_regmap(dev->of_node);
pmu_regmcfg.max_register = resource_size(res) - if (IS_ERR(regmap))
pmu_regmcfg.reg_stride; return dev_err_probe(&pdev->dev, PTR_ERR(regmap),
regmap = devm_regmap_init_mmio(dev, pmu_base_addr, "syscon_node_to_regmap failed\n");
&pmu_regmcfg);
} }
if (IS_ERR(regmap))
return dev_err_probe(&pdev->dev, PTR_ERR(regmap),
"regmap init failed\n");
pmu_context->pmureg = regmap; pmu_context->pmureg = regmap;
pmu_context->dev = dev; pmu_context->dev = dev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment