Re: [PATCH v3 4/5] clk: mediatek: Add USB clock support in MT8173 APMIXEDSYS
From: James Liao
Date: Mon Jul 13 2015 - 22:45:44 EST
Hi Daniel,
On Mon, 2015-07-13 at 22:46 +0800, Daniel Kurtz wrote:
> > +static const struct clk_ops mtk_ref2usb_tx_ops = {
> > + .is_prepared = mtk_ref2usb_tx_is_prepared,
> > + .prepare = mtk_ref2usb_tx_prepare,
> > + .unprepare = mtk_ref2usb_tx_unprepare,
> > +};
>
> Burying the implementation of this special "mtk_ref2usb" clock in
> clk-mt8173,c seems a bit awkward.
> Can you please move it to its own file, like mediatek/clk-usb.c?
Do you mean clk/mediatek/clk-usb.c?
This clock is a MT8173 specific clock, which may not be reused by other
SoCs. So I think it's not necessary to move it to a separated file.
> > +
> > +static struct clk *mtk_clk_register_ref2usb_tx(const char *name,
> > + const char *parent_name, void __iomem *reg)
> > +{
> > + struct mtk_ref2usb_tx *tx;
> > + struct clk_init_data init = {};
> > + struct clk *clk;
> > +
> > + tx = kzalloc(sizeof(*tx), GFP_KERNEL);
> > + if (!tx)
> > + return ERR_PTR(-ENOMEM);
> > +
> > + tx->base_addr = reg;
> > + tx->hw.init = &init;
> > +
> > + init.name = name;
> > + init.ops = &mtk_ref2usb_tx_ops;
> > + init.parent_names = &parent_name;
> > + init.num_parents = 1;
> > +
> > + clk = clk_register(NULL, &tx->hw);
> > +
> > + if (IS_ERR(clk)) {
> > + pr_err("Failed to register clk %s: %ld\n", name, PTR_ERR(clk));
> > + kfree(tx);
> > + }
> > +
> > + return clk;
> > +}
> > +
> > +struct mtk_apmixed_ex {
> > + int id;
> > + const char *name;
> > + const char *parent;
> > + u32 reg_ofs;
> > +};
> > +
> > +#define APMIXED_EX(_id, _name, _parent, _reg_ofs) { \
> > + .id = _id, \
> > + .name = _name, \
> > + .parent = _parent, \
> > + .reg_ofs = _reg_ofs, \
> > + }
> > +
> > +static const struct mtk_apmixed_ex apmixed_ex[] = {
>
> __initconst
OK. I'll fix it in next patch.
> > + APMIXED_EX(CLK_APMIXED_REF2USB_TX, "ref2usb_tx", "clk26m", 0x8),
> > +};
> > +
> > +static void __init mtk_clk_register_apmixedsys_special(struct device_node *node,
> > + struct clk_onecell_data *clk_data)
> > +{
> > + void __iomem *base;
> > + struct clk *clk;
> > + int i;
> > +
> > + base = of_iomap(node, 0);
> > + if (!base) {
> > + pr_err("%s(): ioremap failed\n", __func__);
> > + return;
> > + }
> > +
> > + for (i = 0; i < ARRAY_SIZE(apmixed_ex); i++) {
> > + const struct mtk_apmixed_ex *ape = &apmixed_ex[i];
> > +
> > + clk = mtk_clk_register_ref2usb_tx(ape->name, ape->parent,
> > + base + ape->reg_ofs);
> > +
> > + if (IS_ERR(clk)) {
> > + pr_err("Failed to register clk %s: %ld\n", ape->name,
> > + PTR_ERR(clk));
> > + continue;
> > + }
> > +
> > + clk_data->clks[CLK_APMIXED_REF2USB_TX] = clk;
>
> This works assuming ARRAY_SIZE(apmixed_ex) == 1.
> Either remove the loop since it is unnecessary, or do:
> clk_data->clks[ape->id] = clk;
It should be "clk_data->clks[ape->id] = clk". I'll fix it in next patch.
Best regards,
James
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/