From: Abel Vesa <abel.vesa@nxp.com>
To: Stephen Boyd <sboyd@kernel.org>, Shawn Guo <shawnguo@kernel.org>,
Fabio Estevam <fabio.estevam@nxp.com>,
Aisheng Dong <aisheng.dong@nxp.com>,
Lucas Stach <l.stach@pengutronix.de>,
Sascha Hauer <kernel@pengutronix.de>
Cc: "linux-clk@vger.kernel.org" <linux-clk@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Abel Vesa <abel.vesa@nxp.com>
Subject: [RFC 06/19] clk: imx: clk-cpu: Switch to clk_hw based API
Date: Fri, 22 Mar 2019 15:37:06 +0000 [thread overview]
Message-ID: <1553269010-15591-7-git-send-email-abel.vesa@nxp.com> (raw)
In-Reply-To: <1553269010-15591-1-git-send-email-abel.vesa@nxp.com>
Switch the clk_cpu clock registering function to clk_hw based API
and add a macro for clk based legacy.
Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
---
drivers/clk/imx/clk-cpu.c | 14 +++++++++-----
drivers/clk/imx/clk.h | 5 ++++-
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/drivers/clk/imx/clk-cpu.c b/drivers/clk/imx/clk-cpu.c
index ed1b7e9..a7b9005 100644
--- a/drivers/clk/imx/clk-cpu.c
+++ b/drivers/clk/imx/clk-cpu.c
@@ -75,13 +75,14 @@ static const struct clk_ops clk_cpu_ops = {
.set_rate = clk_cpu_set_rate,
};
-struct clk *imx_clk_cpu(const char *name, const char *parent_name,
+struct clk_hw *imx_clk_hw_cpu(const char *name, const char *parent_name,
struct clk *div, struct clk *mux, struct clk *pll,
struct clk *step)
{
struct clk_cpu *cpu;
- struct clk *clk;
+ struct clk_hw *hw;
struct clk_init_data init;
+ int ret;
cpu = kzalloc(sizeof(*cpu), GFP_KERNEL);
if (!cpu)
@@ -99,10 +100,13 @@ struct clk *imx_clk_cpu(const char *name, const char *parent_name,
init.num_parents = 1;
cpu->hw.init = &init;
+ hw = &cpu->hw;
- clk = clk_register(NULL, &cpu->hw);
- if (IS_ERR(clk))
+ ret = clk_hw_register(NULL, hw);
+ if (ret) {
kfree(cpu);
+ return ERR_PTR(ret);
+ }
- return clk;
+ return hw;
}
diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h
index 69b2a13..a7f69ff 100644
--- a/drivers/clk/imx/clk.h
+++ b/drivers/clk/imx/clk.h
@@ -55,6 +55,9 @@ struct imx_pll14xx_clk {
#define imx_clk_busy_mux(name, reg, shift, width, busy_reg, busy_shift, parent_names, num_parents) \
imx_clk_hw_busy_mux(name, reg, shift, width, busy_reg, busy_shift, parent_names, num_parents)->clk
+#define imx_clk_cpu(name, parent_name, div, mux, pll, step) \
+ imx_clk_hw_cpu(name, parent_name, div, mux, pll, step)->clk
+
struct clk *imx_clk_pll14xx(const char *name, const char *parent_name,
void __iomem *base, const struct imx_pll14xx_clk *pll_clk);
@@ -382,7 +385,7 @@ static inline struct clk_hw *imx_clk_hw_mux_flags(const char *name,
reg, shift, width, 0, &imx_ccm_lock);
}
-struct clk *imx_clk_cpu(const char *name, const char *parent_name,
+struct clk_hw *imx_clk_hw_cpu(const char *name, const char *parent_name,
struct clk *div, struct clk *mux, struct clk *pll,
struct clk *step);
--
2.7.4
next prev parent reply other threads:[~2019-03-22 15:37 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-22 15:37 [RFC 00/19] clk: imx: Switch the imx6 and imx7 to clk_hw based API Abel Vesa
2019-03-22 15:37 ` [RFC 01/19] clk: imx: Remove unused imx_get_clk_hw_fixed Abel Vesa
2019-03-22 15:37 ` [RFC 02/19] clk: imx: Add imx_obtain_fixed_clock clk_hw based variant Abel Vesa
2019-03-22 15:37 ` [RFC 03/19] clk: imx6sx: Do not reparent to unregistered IMX6SX_CLK_AXI Abel Vesa
2019-03-22 15:37 ` [RFC 04/19] clk: imx6q: Do not reparent uninitialized IMX6QDL_CLK_PERIPH2 clock Abel Vesa
2019-03-22 15:37 ` [RFC 05/19] clk: imx: clk-busy: Switch to clk_hw based API Abel Vesa
2019-03-23 6:59 ` Daniel Baluta
2019-03-22 15:37 ` Abel Vesa [this message]
2019-03-22 15:37 ` [RFC 07/19] clk: imx: clk-gate2: " Abel Vesa
2019-03-22 15:37 ` [RFC 08/19] clk: imx: clk-pllv3: " Abel Vesa
2019-03-22 15:37 ` [RFC 09/19] clk: imx: clk-pfd: " Abel Vesa
2019-03-22 15:37 ` [RFC 10/19] clk: imx: clk-gate-exclusive: " Abel Vesa
2019-03-22 15:37 ` [RFC 11/19] clk: imx: clk-fixup-div: " Abel Vesa
2019-03-22 15:37 ` [RFC 12/19] clk: imx: clk-fixup-mux: " Abel Vesa
2019-03-22 15:37 ` [RFC 13/19] clk: imx: Switch wrappers " Abel Vesa
2019-03-22 15:37 ` [RFC 14/19] clk: imx6q: Switch " Abel Vesa
2019-03-22 15:37 ` [RFC 15/19] clk: imx6sl: " Abel Vesa
2019-03-22 15:37 ` [RFC 16/19] clk: imx6sx: " Abel Vesa
2019-03-22 15:37 ` [RFC 17/19] clk: imx6ul: " Abel Vesa
2019-03-22 15:37 ` [RFC 18/19] clk: imx7d: " Abel Vesa
2019-03-22 15:37 ` [RFC 19/19] clk: imx6sll: " Abel Vesa
2019-03-22 16:24 ` [RFC 00/19] clk: imx: Switch the imx6 and imx7 " Fabio Estevam
2019-04-10 22:00 ` Stephen Boyd
2019-04-23 21:49 ` Stephen Boyd
2019-04-24 7:13 ` [EXT] " Abel Vesa
2019-04-25 15:53 ` Stephen Boyd
2019-04-27 20:02 ` Abel Vesa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1553269010-15591-7-git-send-email-abel.vesa@nxp.com \
--to=abel.vesa@nxp.com \
--cc=aisheng.dong@nxp.com \
--cc=fabio.estevam@nxp.com \
--cc=kernel@pengutronix.de \
--cc=l.stach@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sboyd@kernel.org \
--cc=shawnguo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).