* Tero Kristo <t-kristo@xxxxxx> [170530 07:52]:
> If clkctrl clocks are available on a device, populate these automatically
> to replace hwmod main_clk info. First, the patch parses all "ti,clkctrl"
> compatible nodes and maps these against existing clockdomain data. Once
> done, individual hwmod init routines can search for a clkctrl clock
> handle based on the clockdomain info and the created mapping.
...
> --- a/arch/arm/mach-omap2/omap_hwmod.c
> +++ b/arch/arm/mach-omap2/omap_hwmod.c
> /**
> * _init_main_clk - get a struct clk * for the the hwmod's main functional clk
> * @oh: struct omap_hwmod *
> + * @np: device node mapped to this hwmod
> *
> * Called from _init_clocks(). Populates the @oh _clk (main
> * functional clock pointer) if a clock matching the hwmod name is found,
> * or a main_clk is present. Returns 0 on success or -EINVAL on error.
> */
> -static int _init_main_clk(struct omap_hwmod *oh)
> +static int _init_main_clk(struct omap_hwmod *oh, struct device_node *np)
> {
> int ret = 0;
> - char name[MOD_CLK_MAX_NAME_LEN];
> - struct clk *clk;
> - static const char modck[] = "_mod_ck";
> + struct clk *clk = NULL;
>
> - if (strlen(oh->name) >= MOD_CLK_MAX_NAME_LEN - strlen(modck))
> - pr_warn("%s: warning: cropping name for %s\n", __func__,
> - oh->name);
> -
> - strlcpy(name, oh->name, MOD_CLK_MAX_NAME_LEN - strlen(modck));
> - strlcat(name, modck, MOD_CLK_MAX_NAME_LEN);
> + if (np) {
> + clk = _lookup_clkctrl_clk(oh, np);
> +
> + if (!IS_ERR_OR_NULL(clk)) {
> + pr_debug("%s: mapped main_clk %s for %s\n", __func__,
> + __clk_get_name(clk), oh->name);
> + oh->main_clk = __clk_get_name(clk);
> + oh->_clk = clk;
> + soc_ops.disable_direct_prcm(oh);
> + }
> + }
Shouldn't we just parse all "ti,clkctrl" matches to
a list, then match against that list?
Again I'm worried that the "struct device_node *np"
here won't really map to struct omap_hwmod but to one of
the child devices. Or what is the np here?
Regards,
Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
