On 17/03/17 17:41, Tony Lindgren wrote:
* Tero Kristo <t-kristo@xxxxxx> [170317 02:12]:-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"; - - if (strlen(oh->name) >= MOD_CLK_MAX_NAME_LEN - strlen(modck)) - pr_warn("%s: warning: cropping name for %s\n", __func__, - oh->name); + struct clk *clk = NULL; + int i; + int count; + const char *name; + char clk_name[strlen("clkctrl-x") + 1]; - strlcpy(name, oh->name, MOD_CLK_MAX_NAME_LEN - strlen(modck)); - strlcat(name, modck, MOD_CLK_MAX_NAME_LEN); + if (np) { + clk = of_clk_get_by_name(np, "clkctrl"); + if (IS_ERR(clk)) { + /* Try matching by hwmod name */ + count = of_property_count_strings(np, "ti,hwmods"); + for (i = 0; i < count; i++) { + ret = of_property_read_string_index(np, + "ti,hwmods", + i, &name); + if (ret) + continue; + if (!strcmp(name, oh->name)) { + sprintf(clk_name, "clkctrl-%d", i); + clk = of_clk_get_by_name(np, clk_name); + } + } + } + if (!IS_ERR(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); + } + }You should bail out and do nothing here if legacy "ti,hwmods" property is not found. Eventually it will be the interconnect target IP wrapper module that will manage the clock and populate the rest of the hwmod data dynamically.
This is only for transitional support of hwmod, this patch will not be needed for anything later on; or you probably need to do something similar within the interconnect driver itself. The code still needs to care for the cases where we want to find the main clock based on the clock link within hwmod data, so bailing out early will break any boards that don't support the new clkctrl clocks yet.
-Tero -- 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
