cpufreq: scmi: Add support to parse domain-id using #power-domain-cells

The performance domain-id can be described in DT using the power-domains
property or the clock property. The latter is already supported, so let's
add support for the power-domains too.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Link: https://lore.kernel.org/r/20230825112633.236607-12-ulf.hansson@linaro.org
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c
index 78f53e3880941e0f35aa871c624f2be1d47c0641..c8a7ccc42c164f524c5202e743e945dfe4e5d4bc 100644 (file)
--- a/drivers/cpufreq/scmi-cpufreq.c
+++ b/drivers/cpufreq/scmi-cpufreq.c
@@ -72,13 +72,25 @@ static unsigned int scmi_cpufreq_fast_switch(struct cpufreq_policy *policy,
 
 static int scmi_cpu_domain_id(struct device *cpu_dev)
 {
-       struct of_phandle_args clkspec;
-
-       if (of_parse_phandle_with_args(cpu_dev->of_node, "clocks",
-                                      "#clock-cells", 0, &clkspec))
-               return -EINVAL;
+       struct device_node *np = cpu_dev->of_node;
+       struct of_phandle_args domain_id;
+       int index;
+
+       if (of_parse_phandle_with_args(np, "clocks", "#clock-cells", 0,
+                                      &domain_id)) {
+               /* Find the corresponding index for power-domain "perf". */
+               index = of_property_match_string(np, "power-domain-names",
+                                                "perf");
+               if (index < 0)
+                       return -EINVAL;
+
+               if (of_parse_phandle_with_args(np, "power-domains",
+                                              "#power-domain-cells", index,
+                                              &domain_id))
+                       return -EINVAL;
+       }
 
-       return clkspec.args[0];
+       return domain_id.args[0];
 }
 
 static int