| Message ID | 1535728027-24573-5-git-send-email-t-kristo@ti.com |
|---|---|
| State | New |
| Headers | show |
| Series | clk: ti: clkctrl data split based on clkdm boundaries | expand |
Quoting Tero Kristo (2018-08-31 08:07:00) > @@ -492,19 +501,35 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) > > provider->base = of_iomap(node, 0); > > - provider->clkdm_name = kmalloc(strlen(node->parent->name) + 3, > - GFP_KERNEL); > - if (!provider->clkdm_name) { > - kfree(provider); > - return; > + if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT) { > + provider->clkdm_name = kmalloc(strlen(node->parent->name) + 3, > + GFP_KERNEL); > + if (!provider->clkdm_name) { > + kfree(provider); > + return; > + } > + > + /* > + * Create default clkdm name, replace _cm from end of parent > + * node name with _clkdm > + */ > + strcpy(provider->clkdm_name, node->parent->name); > + provider->clkdm_name[strlen(provider->clkdm_name) - 2] = 0; > + } else { > + provider->clkdm_name = kmalloc(strlen(node->name), GFP_KERNEL); > + if (!provider->clkdm_name) { > + kfree(provider); > + return; > + } > + > + /* > + * Create default clkdm name, replace _clkctrl from end of > + * node name with _clkdm > + */ > + strcpy(provider->clkdm_name, node->name); > + provider->clkdm_name[strlen(provider->clkdm_name) - 7] = 0; > } > This conflicts with Rob's change so I tried to fix it up. Let me know if something is horribly wrong with it. I suspect Rob will need to figure out how to make node::name usage go away again, but I put it back.
On Fri, Oct 12, 2018 at 4:25 PM Stephen Boyd <sboyd@kernel.org> wrote: > > Quoting Tero Kristo (2018-08-31 08:07:00) > > @@ -492,19 +501,35 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) > > > > provider->base = of_iomap(node, 0); > > > > - provider->clkdm_name = kmalloc(strlen(node->parent->name) + 3, > > - GFP_KERNEL); > > - if (!provider->clkdm_name) { > > - kfree(provider); > > - return; > > + if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT) { > > + provider->clkdm_name = kmalloc(strlen(node->parent->name) + 3, > > + GFP_KERNEL); > > + if (!provider->clkdm_name) { > > + kfree(provider); > > + return; > > + } > > + > > + /* > > + * Create default clkdm name, replace _cm from end of parent > > + * node name with _clkdm > > + */ > > + strcpy(provider->clkdm_name, node->parent->name); kasprintf can replace kmalloc, strlen and strcpy here and remove the direct access of .name in the process. > > + provider->clkdm_name[strlen(provider->clkdm_name) - 2] = 0; > > + } else { > > + provider->clkdm_name = kmalloc(strlen(node->name), GFP_KERNEL); > > + if (!provider->clkdm_name) { > > + kfree(provider); > > + return; > > + } > > + > > + /* > > + * Create default clkdm name, replace _clkctrl from end of > > + * node name with _clkdm > > + */ > > + strcpy(provider->clkdm_name, node->name); and here. > > + provider->clkdm_name[strlen(provider->clkdm_name) - 7] = 0; > > } > > > > This conflicts with Rob's change so I tried to fix it up. Let me know if > something is horribly wrong with it. I suspect Rob will need to figure > out how to make node::name usage go away again, but I put it back. Then I don't have to find and fix. :) Rob
Quoting Rob Herring (2018-10-12 14:45:08) > On Fri, Oct 12, 2018 at 4:25 PM Stephen Boyd <sboyd@kernel.org> wrote: > > > > Quoting Tero Kristo (2018-08-31 08:07:00) > > > @@ -492,19 +501,35 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) > > > > > > provider->base = of_iomap(node, 0); > > > > > > - provider->clkdm_name = kmalloc(strlen(node->parent->name) + 3, > > > - GFP_KERNEL); > > > - if (!provider->clkdm_name) { > > > - kfree(provider); > > > - return; > > > + if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT) { > > > + provider->clkdm_name = kmalloc(strlen(node->parent->name) + 3, > > > + GFP_KERNEL); > > > + if (!provider->clkdm_name) { > > > + kfree(provider); > > > + return; > > > + } > > > + > > > + /* > > > + * Create default clkdm name, replace _cm from end of parent > > > + * node name with _clkdm > > > + */ > > > + strcpy(provider->clkdm_name, node->parent->name); > > kasprintf can replace kmalloc, strlen and strcpy here and remove the > direct access of .name in the process. > > > > + provider->clkdm_name[strlen(provider->clkdm_name) - 2] = 0; > > > + } else { > > > + provider->clkdm_name = kmalloc(strlen(node->name), GFP_KERNEL); > > > + if (!provider->clkdm_name) { > > > + kfree(provider); > > > + return; > > > + } > > > + > > > + /* > > > + * Create default clkdm name, replace _clkctrl from end of > > > + * node name with _clkdm > > > + */ > > > + strcpy(provider->clkdm_name, node->name); > > and here. > > > > + provider->clkdm_name[strlen(provider->clkdm_name) - 7] = 0; > > > } > > > > > > > This conflicts with Rob's change so I tried to fix it up. Let me know if > > something is horribly wrong with it. I suspect Rob will need to figure > > out how to make node::name usage go away again, but I put it back. > > Then I don't have to find and fix. :) > Can you send a patch? Otherwise I will try and fix this up tomorrow. You can use this git tree for reference: https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-ti
On 13/10/18 01:03, Stephen Boyd wrote: > Quoting Rob Herring (2018-10-12 14:45:08) >> On Fri, Oct 12, 2018 at 4:25 PM Stephen Boyd <sboyd@kernel.org> wrote: >>> >>> Quoting Tero Kristo (2018-08-31 08:07:00) >>>> @@ -492,19 +501,35 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) >>>> >>>> provider->base = of_iomap(node, 0); >>>> >>>> - provider->clkdm_name = kmalloc(strlen(node->parent->name) + 3, >>>> - GFP_KERNEL); >>>> - if (!provider->clkdm_name) { >>>> - kfree(provider); >>>> - return; >>>> + if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT) { >>>> + provider->clkdm_name = kmalloc(strlen(node->parent->name) + 3, >>>> + GFP_KERNEL); >>>> + if (!provider->clkdm_name) { >>>> + kfree(provider); >>>> + return; >>>> + } >>>> + >>>> + /* >>>> + * Create default clkdm name, replace _cm from end of parent >>>> + * node name with _clkdm >>>> + */ >>>> + strcpy(provider->clkdm_name, node->parent->name); >> >> kasprintf can replace kmalloc, strlen and strcpy here and remove the >> direct access of .name in the process. >> >>>> + provider->clkdm_name[strlen(provider->clkdm_name) - 2] = 0; >>>> + } else { >>>> + provider->clkdm_name = kmalloc(strlen(node->name), GFP_KERNEL); >>>> + if (!provider->clkdm_name) { >>>> + kfree(provider); >>>> + return; >>>> + } >>>> + >>>> + /* >>>> + * Create default clkdm name, replace _clkctrl from end of >>>> + * node name with _clkdm >>>> + */ >>>> + strcpy(provider->clkdm_name, node->name); >> >> and here. >> >>>> + provider->clkdm_name[strlen(provider->clkdm_name) - 7] = 0; >>>> } >>>> >>> >>> This conflicts with Rob's change so I tried to fix it up. Let me know if >>> something is horribly wrong with it. I suspect Rob will need to figure >>> out how to make node::name usage go away again, but I put it back. >> >> Then I don't have to find and fix. :) >> > > Can you send a patch? Otherwise I will try and fix this up tomorrow. > You can use this git tree for reference: > > https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-ti > Sorry, I've also been OoO for last week, just captured this. Do you need help on this one? I can take a look at it tomorrow if there is a specific merge conflict you want me to take a look at. -Tero -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Quoting Tero Kristo (2018-10-15 08:58:21) > On 13/10/18 01:03, Stephen Boyd wrote: > > Quoting Rob Herring (2018-10-12 14:45:08) > >> On Fri, Oct 12, 2018 at 4:25 PM Stephen Boyd <sboyd@kernel.org> wrote: > >>> > >>> Quoting Tero Kristo (2018-08-31 08:07:00) > >>>> @@ -492,19 +501,35 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) > >>>> > >>>> provider->base = of_iomap(node, 0); > >>>> > >>>> - provider->clkdm_name = kmalloc(strlen(node->parent->name) + 3, > >>>> - GFP_KERNEL); > >>>> - if (!provider->clkdm_name) { > >>>> - kfree(provider); > >>>> - return; > >>>> + if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT) { > >>>> + provider->clkdm_name = kmalloc(strlen(node->parent->name) + 3, > >>>> + GFP_KERNEL); > >>>> + if (!provider->clkdm_name) { > >>>> + kfree(provider); > >>>> + return; > >>>> + } > >>>> + > >>>> + /* > >>>> + * Create default clkdm name, replace _cm from end of parent > >>>> + * node name with _clkdm > >>>> + */ > >>>> + strcpy(provider->clkdm_name, node->parent->name); > >> > >> kasprintf can replace kmalloc, strlen and strcpy here and remove the > >> direct access of .name in the process. > >> > >>>> + provider->clkdm_name[strlen(provider->clkdm_name) - 2] = 0; > >>>> + } else { > >>>> + provider->clkdm_name = kmalloc(strlen(node->name), GFP_KERNEL); > >>>> + if (!provider->clkdm_name) { > >>>> + kfree(provider); > >>>> + return; > >>>> + } > >>>> + > >>>> + /* > >>>> + * Create default clkdm name, replace _clkctrl from end of > >>>> + * node name with _clkdm > >>>> + */ > >>>> + strcpy(provider->clkdm_name, node->name); > >> > >> and here. > >> > >>>> + provider->clkdm_name[strlen(provider->clkdm_name) - 7] = 0; > >>>> } > >>>> > >>> > >>> This conflicts with Rob's change so I tried to fix it up. Let me know if > >>> something is horribly wrong with it. I suspect Rob will need to figure > >>> out how to make node::name usage go away again, but I put it back. > >> > >> Then I don't have to find and fix. :) > >> > > > > Can you send a patch? Otherwise I will try and fix this up tomorrow. > > You can use this git tree for reference: > > > > https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-ti > > > > Sorry, I've also been OoO for last week, just captured this. > > Do you need help on this one? I can take a look at it tomorrow if there > is a specific merge conflict you want me to take a look at. This is what I got: ----8<--- diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c index 955f2e26ab00..78deca44789d 100644 --- a/drivers/clk/ti/clkctrl.c +++ b/drivers/clk/ti/clkctrl.c @@ -520,8 +520,7 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) provider->base = of_iomap(node, 0); if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT) { - provider->clkdm_name = kmalloc(strlen(node->parent->name) + 3, - GFP_KERNEL); + provider->clkdm_name = kasprintf(GFP_KERNEL, "%pOFn%s", node->parent, "xxx"); if (!provider->clkdm_name) { kfree(provider); return; @@ -531,10 +530,9 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) * Create default clkdm name, replace _cm from end of parent * node name with _clkdm */ - strcpy(provider->clkdm_name, node->parent->name); - provider->clkdm_name[strlen(provider->clkdm_name) - 2] = 0; + provider->clkdm_name[strlen(provider->clkdm_name) - 5] = 0; } else { - provider->clkdm_name = kmalloc(strlen(node->name), GFP_KERNEL); + provider->clkdm_name = kasprintf(GFP_KERNEL, "%pOFn", node->name); if (!provider->clkdm_name) { kfree(provider); return; @@ -544,7 +542,6 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) * Create default clkdm name, replace _clkctrl from end of * node name with _clkdm */ - strcpy(provider->clkdm_name, node->name); provider->clkdm_name[strlen(provider->clkdm_name) - 7] = 0; }
On 16/10/18 02:38, Stephen Boyd wrote: > Quoting Tero Kristo (2018-10-15 08:58:21) >> On 13/10/18 01:03, Stephen Boyd wrote: >>> Quoting Rob Herring (2018-10-12 14:45:08) >>>> On Fri, Oct 12, 2018 at 4:25 PM Stephen Boyd <sboyd@kernel.org> wrote: >>>>> >>>>> Quoting Tero Kristo (2018-08-31 08:07:00) >>>>>> @@ -492,19 +501,35 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) >>>>>> >>>>>> provider->base = of_iomap(node, 0); >>>>>> >>>>>> - provider->clkdm_name = kmalloc(strlen(node->parent->name) + 3, >>>>>> - GFP_KERNEL); >>>>>> - if (!provider->clkdm_name) { >>>>>> - kfree(provider); >>>>>> - return; >>>>>> + if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT) { >>>>>> + provider->clkdm_name = kmalloc(strlen(node->parent->name) + 3, >>>>>> + GFP_KERNEL); >>>>>> + if (!provider->clkdm_name) { >>>>>> + kfree(provider); >>>>>> + return; >>>>>> + } >>>>>> + >>>>>> + /* >>>>>> + * Create default clkdm name, replace _cm from end of parent >>>>>> + * node name with _clkdm >>>>>> + */ >>>>>> + strcpy(provider->clkdm_name, node->parent->name); >>>> >>>> kasprintf can replace kmalloc, strlen and strcpy here and remove the >>>> direct access of .name in the process. >>>> >>>>>> + provider->clkdm_name[strlen(provider->clkdm_name) - 2] = 0; >>>>>> + } else { >>>>>> + provider->clkdm_name = kmalloc(strlen(node->name), GFP_KERNEL); >>>>>> + if (!provider->clkdm_name) { >>>>>> + kfree(provider); >>>>>> + return; >>>>>> + } >>>>>> + >>>>>> + /* >>>>>> + * Create default clkdm name, replace _clkctrl from end of >>>>>> + * node name with _clkdm >>>>>> + */ >>>>>> + strcpy(provider->clkdm_name, node->name); >>>> >>>> and here. >>>> >>>>>> + provider->clkdm_name[strlen(provider->clkdm_name) - 7] = 0; >>>>>> } >>>>>> >>>>> >>>>> This conflicts with Rob's change so I tried to fix it up. Let me know if >>>>> something is horribly wrong with it. I suspect Rob will need to figure >>>>> out how to make node::name usage go away again, but I put it back. >>>> >>>> Then I don't have to find and fix. :) >>>> >>> >>> Can you send a patch? Otherwise I will try and fix this up tomorrow. >>> You can use this git tree for reference: >>> >>> https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-ti >>> >> >> Sorry, I've also been OoO for last week, just captured this. >> >> Do you need help on this one? I can take a look at it tomorrow if there >> is a specific merge conflict you want me to take a look at. > > This is what I got: Ok that looks fine except one detail below: > > ----8<--- > diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c > index 955f2e26ab00..78deca44789d 100644 > --- a/drivers/clk/ti/clkctrl.c > +++ b/drivers/clk/ti/clkctrl.c > @@ -520,8 +520,7 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) > provider->base = of_iomap(node, 0); > > if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT) { > - provider->clkdm_name = kmalloc(strlen(node->parent->name) + 3, > - GFP_KERNEL); > + provider->clkdm_name = kasprintf(GFP_KERNEL, "%pOFn%s", node->parent, "xxx"); > if (!provider->clkdm_name) { > kfree(provider); > return; > @@ -531,10 +530,9 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) > * Create default clkdm name, replace _cm from end of parent > * node name with _clkdm > */ > - strcpy(provider->clkdm_name, node->parent->name); > - provider->clkdm_name[strlen(provider->clkdm_name) - 2] = 0; > + provider->clkdm_name[strlen(provider->clkdm_name) - 5] = 0; > } else { > - provider->clkdm_name = kmalloc(strlen(node->name), GFP_KERNEL); > + provider->clkdm_name = kasprintf(GFP_KERNEL, "%pOFn", node->name); should be: + provider->clkdm_name = kasprintf(GFP_KERNEL, "%pOFn", node); ...instead right? -Tero > if (!provider->clkdm_name) { > kfree(provider); > return; > @@ -544,7 +542,6 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) > * Create default clkdm name, replace _clkctrl from end of > * node name with _clkdm > */ > - strcpy(provider->clkdm_name, node->name); > provider->clkdm_name[strlen(provider->clkdm_name) - 7] = 0; > } > > -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Quoting Tero Kristo (2018-10-16 00:37:06) > On 16/10/18 02:38, Stephen Boyd wrote: > > return; > > @@ -531,10 +530,9 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) > > * Create default clkdm name, replace _cm from end of parent > > * node name with _clkdm > > */ > > - strcpy(provider->clkdm_name, node->parent->name); > > - provider->clkdm_name[strlen(provider->clkdm_name) - 2] = 0; > > + provider->clkdm_name[strlen(provider->clkdm_name) - 5] = 0; > > } else { > > - provider->clkdm_name = kmalloc(strlen(node->name), GFP_KERNEL); > > + provider->clkdm_name = kasprintf(GFP_KERNEL, "%pOFn", node->name); > > should be: > > + provider->clkdm_name = kasprintf(GFP_KERNEL, "%pOFn", node); > > ...instead right? > Yes. Thanks for catching it!
diff --git a/drivers/clk/ti/clk.c b/drivers/clk/ti/clk.c index 27e0979..8b89be1 100644 --- a/drivers/clk/ti/clk.c +++ b/drivers/clk/ti/clk.c @@ -34,7 +34,7 @@ struct ti_clk_ll_ops *ti_clk_ll_ops; static struct device_node *clocks_node_ptr[CLK_MAX_MEMMAPS]; -static struct ti_clk_features ti_clk_features; +struct ti_clk_features ti_clk_features; struct clk_iomap { struct regmap *regmap; @@ -140,6 +140,9 @@ void __init ti_dt_clocks_register(struct ti_dt_clk oclks[]) int ret; static bool clkctrl_nodes_missing; static bool has_clkctrl_data; + static bool compat_mode; + + compat_mode = ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT; for (c = oclks; c->node_name != NULL; c++) { strcpy(buf, c->node_name); @@ -164,7 +167,7 @@ void __init ti_dt_clocks_register(struct ti_dt_clk oclks[]) continue; node = of_find_node_by_name(NULL, buf); - if (num_args) { + if (num_args && compat_mode) { parent = node; node = of_get_child_by_name(parent, "clk"); of_node_put(parent); diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c index 421b0539..51cb73a 100644 --- a/drivers/clk/ti/clkctrl.c +++ b/drivers/clk/ti/clkctrl.c @@ -259,8 +259,13 @@ static struct clk_hw *_ti_omap4_clkctrl_xlate(struct of_phandle_args *clkspec, struct omap_clkctrl_clk *clkctrl_clk; int ret = 0; - init.name = kasprintf(GFP_KERNEL, "%s:%s:%04x:%d", node->parent->name, - node->name, 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, + bit); + else + init.name = kasprintf(GFP_KERNEL, "%s:%04x:%d", node->name, + offset, bit); clkctrl_clk = kzalloc(sizeof(*clkctrl_clk), GFP_KERNEL); if (!init.name || !clkctrl_clk) { ret = -ENOMEM; @@ -441,6 +446,10 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) u32 addr; int ret; + if (!(ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT) && + !strcmp(node->name, "clk")) + ti_clk_features.flags |= TI_CLK_CLKCTRL_COMPAT; + addrp = of_get_address(node, 0, NULL, NULL); addr = (u32)of_translate_address(node, addrp); @@ -492,19 +501,35 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) provider->base = of_iomap(node, 0); - provider->clkdm_name = kmalloc(strlen(node->parent->name) + 3, - GFP_KERNEL); - if (!provider->clkdm_name) { - kfree(provider); - return; + if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT) { + provider->clkdm_name = kmalloc(strlen(node->parent->name) + 3, + GFP_KERNEL); + if (!provider->clkdm_name) { + kfree(provider); + return; + } + + /* + * Create default clkdm name, replace _cm from end of parent + * node name with _clkdm + */ + strcpy(provider->clkdm_name, node->parent->name); + provider->clkdm_name[strlen(provider->clkdm_name) - 2] = 0; + } else { + provider->clkdm_name = kmalloc(strlen(node->name), GFP_KERNEL); + if (!provider->clkdm_name) { + kfree(provider); + return; + } + + /* + * Create default clkdm name, replace _clkctrl from end of + * node name with _clkdm + */ + strcpy(provider->clkdm_name, node->name); + provider->clkdm_name[strlen(provider->clkdm_name) - 7] = 0; } - /* - * Create default clkdm name, replace _cm from end of parent node - * name with _clkdm - */ - strcpy(provider->clkdm_name, node->parent->name); - provider->clkdm_name[strlen(provider->clkdm_name) - 2] = 0; strcat(provider->clkdm_name, "clkdm"); INIT_LIST_HEAD(&provider->clocks); @@ -539,9 +564,13 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) init.flags = 0; if (reg_data->flags & CLKF_SET_RATE_PARENT) init.flags |= CLK_SET_RATE_PARENT; - init.name = kasprintf(GFP_KERNEL, "%s:%s:%04x:%d", - node->parent->name, node->name, - 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, + reg_data->offset, 0); + else + init.name = kasprintf(GFP_KERNEL, "%s:%04x:%d", + node->name, reg_data->offset, 0); clkctrl_clk = kzalloc(sizeof(*clkctrl_clk), GFP_KERNEL); if (!init.name || !clkctrl_clk) goto cleanup; diff --git a/drivers/clk/ti/clock.h b/drivers/clk/ti/clock.h index b582780..ce4aad6 100644 --- a/drivers/clk/ti/clock.h +++ b/drivers/clk/ti/clock.h @@ -233,6 +233,8 @@ int ti_clk_retry_init(struct device_node *node, void *user, extern const struct clk_ops ti_clk_mux_ops; extern const struct clk_ops omap_gate_clk_ops; +extern struct ti_clk_features ti_clk_features; + void omap2_init_clk_clkdm(struct clk_hw *hw); int omap2_clkops_enable_clkdm(struct clk_hw *hw); void omap2_clkops_disable_clkdm(struct clk_hw *hw); diff --git a/include/linux/clk/ti.h b/include/linux/clk/ti.h index a8faa38..3301bd0 100644 --- a/include/linux/clk/ti.h +++ b/include/linux/clk/ti.h @@ -290,6 +290,7 @@ struct ti_clk_features { #define TI_CLK_DPLL4_DENY_REPROGRAM BIT(1) #define TI_CLK_DISABLE_CLKDM_CONTROL BIT(2) #define TI_CLK_ERRATA_I810 BIT(3) +#define TI_CLK_CLKCTRL_COMPAT BIT(4) void ti_clk_setup_features(struct ti_clk_features *features); const struct ti_clk_features *ti_clk_get_features(void);
Currently, only one clkctrl node can be added under a specific CM node due to limitation with the implementation. Modify the code to pick-up clockdomain name from the clkctrl node instead of CM node if provided. Also, add a new flag to the TI clock driver so that both modes can be supported simultaneously. Signed-off-by: Tero Kristo <t-kristo@ti.com> --- drivers/clk/ti/clk.c | 7 ++++-- drivers/clk/ti/clkctrl.c | 61 +++++++++++++++++++++++++++++++++++------------- drivers/clk/ti/clock.h | 2 ++ include/linux/clk/ti.h | 1 + 4 files changed, 53 insertions(+), 18 deletions(-) -- 1.9.1 -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki