struct omap_clkctrl_clk *clkctrl_clk;
int ret = 0;
- init.name = kasprintf(GFP_KERNEL, "%pOFn:%pOFn:%04x:%d", node->parent,
- node, offset, bit);
+ if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT)
- init.name = kasprintf(GFP_KERNEL, "%s:%s:%04x:%d",
- node->parent->name, node->name, offset,
++ init.name = kasprintf(GFP_KERNEL, "%pOFn:%pOFn:%04x:%d",
++ node->parent, node, offset,
+ bit);
+ else
- init.name = kasprintf(GFP_KERNEL, "%s:%04x:%d", node->name,
++ init.name = kasprintf(GFP_KERNEL, "%pOFn:%04x:%d", node,
+ offset, bit);
clkctrl_clk = kzalloc(sizeof(*clkctrl_clk), GFP_KERNEL);
if (!init.name || !clkctrl_clk) {
ret = -ENOMEM;
init.flags = 0;
if (reg_data->flags & CLKF_SET_RATE_PARENT)
init.flags |= CLK_SET_RATE_PARENT;
- init.name = kasprintf(GFP_KERNEL, "%pOFn:%pOFn:%04x:%d",
- node->parent, node,
- reg_data->offset, 0);
+ if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT)
- init.name = kasprintf(GFP_KERNEL, "%s:%s:%04x:%d",
- node->parent->name, node->name,
++ init.name = kasprintf(GFP_KERNEL, "%pOFn:%pOFn:%04x:%d",
++ node->parent, node,
+ reg_data->offset, 0);
+ else
- init.name = kasprintf(GFP_KERNEL, "%s:%04x:%d",
- node->name, reg_data->offset, 0);
++ init.name = kasprintf(GFP_KERNEL, "%pOFn:%04x:%d",
++ node, reg_data->offset, 0);
clkctrl_clk = kzalloc(sizeof(*clkctrl_clk), GFP_KERNEL);
if (!init.name || !clkctrl_clk)
goto cleanup;