From: Dong Aisheng <aisheng.dong@nxp.com>
To: linux-clk@vger.kernel.org
Cc: Dong Aisheng <aisheng.dong@nxp.com>,
sboyd@kernel.org, mturquette@baylibre.com, linux-imx@nxp.com,
kernel@pengutronix.de, fabio.estevam@nxp.com,
shawnguo@kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH V6 05/12] clk: imx: scu: allow scu clk to take device pointer
Date: Sun, 15 Mar 2020 21:43:49 +0800 [thread overview]
Message-ID: <1584279836-29825-6-git-send-email-aisheng.dong@nxp.com> (raw)
In-Reply-To: <1584279836-29825-1-git-send-email-aisheng.dong@nxp.com>
Used to support runtime pm.
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Michael Turquette <mturquette@baylibre.com>
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
---
ChangeLog:
v4->v5:
* no changes
v3->v4:
* add the missing dev poninter when call __imx_clk_scu in probe
v3: new patch
---
drivers/clk/imx/clk-scu.c | 9 +++++----
drivers/clk/imx/clk-scu.h | 9 +++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/clk/imx/clk-scu.c b/drivers/clk/imx/clk-scu.c
index 4c1980d5901d..d474753712f7 100644
--- a/drivers/clk/imx/clk-scu.c
+++ b/drivers/clk/imx/clk-scu.c
@@ -384,8 +384,9 @@ static const struct clk_ops clk_scu_cpu_ops = {
.unprepare = clk_scu_unprepare,
};
-struct clk_hw *__imx_clk_scu(const char *name, const char * const *parents,
- int num_parents, u32 rsrc_id, u8 clk_type)
+struct clk_hw *__imx_clk_scu(struct device *dev, const char *name,
+ const char * const *parents, int num_parents,
+ u32 rsrc_id, u8 clk_type)
{
struct clk_init_data init;
struct clk_scu *clk;
@@ -419,7 +420,7 @@ struct clk_hw *__imx_clk_scu(const char *name, const char * const *parents,
clk->hw.init = &init;
hw = &clk->hw;
- ret = clk_hw_register(NULL, hw);
+ ret = clk_hw_register(dev, hw);
if (ret) {
kfree(clk);
hw = ERR_PTR(ret);
@@ -450,7 +451,7 @@ static int imx_clk_scu_probe(struct platform_device *pdev)
struct imx_scu_clk_node *clk = dev_get_platdata(dev);
struct clk_hw *hw;
- hw = __imx_clk_scu(clk->name, clk->parents, clk->num_parents,
+ hw = __imx_clk_scu(NULL, clk->name, clk->parents, clk->num_parents,
clk->rsrc, clk->clk_type);
if (IS_ERR(hw))
return PTR_ERR(hw);
diff --git a/drivers/clk/imx/clk-scu.h b/drivers/clk/imx/clk-scu.h
index a512f81ed801..11eb3781ab6b 100644
--- a/drivers/clk/imx/clk-scu.h
+++ b/drivers/clk/imx/clk-scu.h
@@ -19,8 +19,9 @@ struct clk_hw *imx_clk_scu_alloc_dev(const char *name,
const char * const *parents,
int num_parents, u32 rsrc_id, u8 clk_type);
-struct clk_hw *__imx_clk_scu(const char *name, const char * const *parents,
- int num_parents, u32 rsrc_id, u8 clk_type);
+struct clk_hw *__imx_clk_scu(struct device *dev, const char *name,
+ const char * const *parents, int num_parents,
+ u32 rsrc_id, u8 clk_type);
static inline struct clk_hw *imx_clk_scu(const char *name, u32 rsrc_id,
u8 clk_type, u8 clk_cells)
@@ -28,7 +29,7 @@ static inline struct clk_hw *imx_clk_scu(const char *name, u32 rsrc_id,
if (clk_cells == 2)
return imx_clk_scu_alloc_dev(name, NULL, 0, rsrc_id, clk_type);
else
- return __imx_clk_scu(name, NULL, 0, rsrc_id, clk_type);
+ return __imx_clk_scu(NULL, name, NULL, 0, rsrc_id, clk_type);
}
static inline struct clk_hw *imx_clk_scu2(const char *name, const char * const *parents,
@@ -38,7 +39,7 @@ static inline struct clk_hw *imx_clk_scu2(const char *name, const char * const *
if (clk_cells == 2)
return imx_clk_scu_alloc_dev(name, parents, num_parents, rsrc_id, clk_type);
else
- return __imx_clk_scu(name, parents, num_parents, rsrc_id, clk_type);
+ return __imx_clk_scu(NULL, name, parents, num_parents, rsrc_id, clk_type);
}
struct clk_hw *imx_clk_lpcg_scu(const char *name, const char *parent_name,
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-03-15 13:51 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-15 13:43 [PATCH V6 00/12] clk: imx8: add new clock binding for better pm support Dong Aisheng
2020-03-15 13:43 ` [PATCH V6 01/12] dt-bindings: firmware: imx-scu: new binding to parse clocks from device tree Dong Aisheng
2020-03-15 13:43 ` [PATCH V6 02/12] dt-bindings: clock: imx-lpcg: add support " Dong Aisheng
2020-03-15 13:43 ` [PATCH V6 03/12] clk: imx: scu: add two cells binding support Dong Aisheng
2020-05-05 5:08 ` Stephen Boyd
2020-05-05 13:47 ` Aisheng Dong
[not found] ` <159056841061.88029.216464972820415110@swboyd.mtv.corp.google.com>
[not found] ` <AM6PR04MB4966691C34454AFAB7DAFFB5808A0@AM6PR04MB4966.eurprd04.prod.outlook.com>
[not found] ` <159249627008.62212.17868674898739401597@swboyd.mtv.corp.google.com>
2020-06-19 14:50 ` Aisheng Dong
2020-03-15 13:43 ` [PATCH V6 04/12] clk: imx: scu: bypass cpu power domains Dong Aisheng
2020-05-05 4:49 ` Stephen Boyd
2020-03-15 13:43 ` Dong Aisheng [this message]
2020-05-05 5:09 ` [PATCH V6 05/12] clk: imx: scu: allow scu clk to take device pointer Stephen Boyd
2020-03-15 13:43 ` [PATCH V6 06/12] clk: imx: scu: add runtime pm support Dong Aisheng
2020-05-05 5:10 ` Stephen Boyd
2020-03-15 13:43 ` [PATCH V6 07/12] clk: imx: scu: add suspend/resume support Dong Aisheng
2020-05-05 4:50 ` Stephen Boyd
2020-03-15 13:43 ` [PATCH V6 08/12] clk: imx: imx8qxp-lpcg: add parsing clocks from device tree Dong Aisheng
2020-05-05 5:11 ` Stephen Boyd
2020-03-15 13:43 ` [PATCH V6 09/12] clk: imx: lpcg: allow lpcg clk to take device pointer Dong Aisheng
2020-05-05 4:58 ` Stephen Boyd
2020-03-15 13:43 ` [PATCH V6 10/12] clk: imx: clk-imx8qxp-lpcg: add runtime pm support Dong Aisheng
2020-05-05 4:51 ` Stephen Boyd
2020-03-15 13:43 ` [PATCH V6 11/12] clk: imx: lpcg: add suspend/resume support Dong Aisheng
2020-05-05 4:53 ` Stephen Boyd
2020-03-15 13:43 ` [PATCH V6 12/12] clk: imx: scu: unregister clocks if add provider failed Dong Aisheng
2020-05-05 4:55 ` Stephen Boyd
2020-05-05 14:06 ` Aisheng Dong
2020-03-15 14:10 ` [PATCH V6 00/12] clk: imx8: add new clock binding for better pm support Aisheng Dong
2020-03-26 3:14 ` Aisheng Dong
2020-04-07 2:23 ` Aisheng Dong
2020-04-18 12:39 ` Aisheng Dong
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=1584279836-29825-6-git-send-email-aisheng.dong@nxp.com \
--to=aisheng.dong@nxp.com \
--cc=fabio.estevam@nxp.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=mturquette@baylibre.com \
--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).