From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753455AbbGNCpm (ORCPT ); Mon, 13 Jul 2015 22:45:42 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:33328 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752179AbbGNCpk (ORCPT ); Mon, 13 Jul 2015 22:45:40 -0400 X-Listener-Flag: 11101 Message-ID: <1436841935.9416.10.camel@mtksdaap41> Subject: Re: [PATCH v3 4/5] clk: mediatek: Add USB clock support in MT8173 APMIXEDSYS From: James Liao To: Daniel Kurtz CC: Matthias Brugger , Mike Turquette , Stephen Boyd , "Heiko Stubner" , srv_heupstream , Ricky Liang , Rob Herring , Sascha Hauer , "open list:OPEN FIRMWARE AND..." , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Date: Tue, 14 Jul 2015 10:45:35 +0800 In-Reply-To: References: <1436522405-13923-1-git-send-email-jamesjj.liao@mediatek.com> <1436522405-13923-5-git-send-email-jamesjj.liao@mediatek.com> Content-Type: text/plain; charset="us-ascii" X-Mailer: Evolution 3.2.3-0ubuntu6 Content-Transfer-Encoding: 7bit MIME-Version: 1.0 X-MTK: N Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: James Liao Subject: Re: [PATCH v3 4/5] clk: mediatek: Add USB clock support in MT8173 APMIXEDSYS Date: Tue, 14 Jul 2015 10:45:35 +0800 Message-ID: <1436841935.9416.10.camel@mtksdaap41> References: <1436522405-13923-1-git-send-email-jamesjj.liao@mediatek.com> <1436522405-13923-5-git-send-email-jamesjj.liao@mediatek.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Daniel Kurtz Cc: Matthias Brugger , Mike Turquette , Stephen Boyd , Heiko Stubner , srv_heupstream , Ricky Liang , Rob Herring , Sascha Hauer , "open list:OPEN FIRMWARE AND..." , "linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" , "linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: linux-mediatek@lists.infradead.org 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 devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: jamesjj.liao@mediatek.com (James Liao) Date: Tue, 14 Jul 2015 10:45:35 +0800 Subject: [PATCH v3 4/5] clk: mediatek: Add USB clock support in MT8173 APMIXEDSYS In-Reply-To: References: <1436522405-13923-1-git-send-email-jamesjj.liao@mediatek.com> <1436522405-13923-5-git-send-email-jamesjj.liao@mediatek.com> Message-ID: <1436841935.9416.10.camel@mtksdaap41> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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