On Tue, Jun 17, 2014 at 2:56 PM, Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx> wrote: > The Cortex-A7 and Cortex-A15 based SoCs need a clock-frequency property in the > topology code. > > Allow to use a clock to provide the same information. > > Signed-off-by: Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx> > --- > arch/arm/kernel/topology.c | 24 +++++++++++++++++------- > 1 file changed, 17 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c > index 9d853189028b..0bd044cbbcb2 100644 > --- a/arch/arm/kernel/topology.c > +++ b/arch/arm/kernel/topology.c > @@ -11,6 +11,7 @@ > * for more details. > */ > > +#include <linux/clk.h> > #include <linux/cpu.h> > #include <linux/cpumask.h> > #include <linux/export.h> > @@ -100,8 +101,8 @@ static void __init parse_dt_topology(void) > GFP_NOWAIT); > > for_each_possible_cpu(cpu) { > - const u32 *rate; > - int len; > + struct clk *clk; > + u32 rate = 0; > > /* too early to use cpu->of_node */ > cn = of_get_cpu_node(cpu, NULL); > @@ -117,14 +118,23 @@ static void __init parse_dt_topology(void) > if (cpu_eff->compatible == NULL) > continue; > > - rate = of_get_property(cn, "clock-frequency", &len); > - if (!rate || len != 4) { > - pr_err("%s missing clock-frequency property\n", > - cn->full_name); > + clk = of_clk_get(cn, 0); > + if (!IS_ERR(clk)) { > + rate = clk_get_rate(clk); > + } else { > + if (of_property_read_u32(cn, "clock-frequency", &rate)) { > + pr_err("%s missing clocks or clock-frequency properties\n", > + cn->full_name); This error check and message is redundant with the next error message. You can remove this one and just call of_property_read_u32. rate will remain untouched on error. -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html