mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-31 03:35:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

pmdomain: Merge branch fixes into next

Browse Source 
Merge the pmdomain fixes for v7.2-rc[n] into the next branch, to allow
them to get tested together with the pmdomain changes that are targeted
for the next release.

Signed-off-by: Ulf Hansson <ulfh@kernel.org>
This commit is contained in:
Ulf Hansson
2026-07-27 11:49:03 +02:00
parent 0fb3c98da0 3e013bc8b9
commit 84a89ca15b
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/pmdomain/mediatek/mtk-pm-domains.c
View File

@@ -1155,12 +1155,15 @@ static int scpsys_get_bus_protection_legacy(struct device *dev, struct scpsys *s
node = of_find_node_with_property(np, "mediatek,infracfg");
if (node) {
regmap[0] = syscon_regmap_lookup_by_phandle(node, "mediatek,infracfg");
of_node_put(node);
num_regmaps++;
if (IS_ERR(regmap[0]))
return dev_err_probe(dev, PTR_ERR(regmap[0]),
if (IS_ERR(regmap[0])) {
ret = dev_err_probe(dev, PTR_ERR(regmap[0]),
"%pOF: failed to get infracfg regmap\n",
node);
of_node_put(node);
return ret;
}
of_node_put(node);
} else {
regmap[0] = NULL;
}
@@ -1169,17 +1172,22 @@ static int scpsys_get_bus_protection_legacy(struct device *dev, struct scpsys *s
node = of_find_node_with_property(np, "mediatek,smi");
if (node) {
smi_np = of_parse_phandle(node, "mediatek,smi", 0);
of_node_put(node);
if (!smi_np)
if (!smi_np) {
of_node_put(node);
return -ENODEV;
}
regmap[1] = device_node_to_regmap(smi_np);
num_regmaps++;
of_node_put(smi_np);
if (IS_ERR(regmap[1]))
return dev_err_probe(dev, PTR_ERR(regmap[1]),
if (IS_ERR(regmap[1])) {
ret = dev_err_probe(dev, PTR_ERR(regmap[1]),
"%pOF: failed to get SMI regmap\n",
node);
of_node_put(node);
return ret;
}
of_node_put(node);
} else {
regmap[1] = NULL;
}