cpuidle: dt: Support hierarchical CPU idle states

Currently CPU's idle states are represented using the flattened model.
Let's add support for the hierarchical layout, via converting to use
of_get_cpu_state_node().

Suggested-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Lina Iyer <lina.iyer@linaro.org>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Co-developed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
Acked-by: Rafael J. Wysocki <rafael@kernel.org>

diff --git a/drivers/cpuidle/dt_idle_states.c b/drivers/cpuidle/dt_idle_states.c
index d06d21a..252f2a9 100644 (file)
--- a/drivers/cpuidle/dt_idle_states.c
+++ b/drivers/cpuidle/dt_idle_states.c
@@ -111,8 +111,7 @@ static bool idle_state_valid(struct device_node *state_node, unsigned int idx,
        for (cpu = cpumask_next(cpumask_first(cpumask), cpumask);
             cpu < nr_cpu_ids; cpu = cpumask_next(cpu, cpumask)) {
                cpu_node = of_cpu_device_node_get(cpu);
-               curr_state_node = of_parse_phandle(cpu_node, "cpu-idle-states",
-                                                  idx);
+               curr_state_node = of_get_cpu_state_node(cpu_node, idx);
                if (state_node != curr_state_node)
                        valid = false;
 
@@ -170,7 +169,7 @@ int dt_init_idle_driver(struct cpuidle_driver *drv,
        cpu_node = of_cpu_device_node_get(cpumask_first(cpumask));
 
        for (i = 0; ; i++) {
-               state_node = of_parse_phandle(cpu_node, "cpu-idle-states", i);
+               state_node = of_get_cpu_state_node(cpu_node, i);
                if (!state_node)
                        break;