From: Tali Perry <tali.perry1@gmail.com>
To: avifishman70@gmail.com, tmaimon77@gmail.com, venture@google.com,
yuenn@google.com, brendanhiggins@google.com,
mturquette@baylibre.com, sboyd@kernel.org
Cc: openbmc@lists.ozlabs.org, linux-clk@vger.kernel.org,
linux-kernel@vger.kernel.org, Tali Perry <tali.perry1@gmail.com>,
Wei Yongjun <weiyongjun1@huawei.com>
Subject: [PATCH v2] clk: npcm7xx: get fixed clocks from DT
Date: Thu, 6 Dec 2018 10:44:31 +0200 [thread overview]
Message-ID: <20181206084431.315559-1-tali.perry1@gmail.com> (raw)
The npcm7xx clock module includes 4 PLLs and then a tree of muxes and dividers.
All muxes and dividers are preset before Linux boots. The presetting can change
according to the board.
Linux drivers need to know what the frequencies are, but they cannot change it,
so this whole driver is intended as read only mechanism for clocks.
Before this change PLLs input clk value was defined inside the driver.
With this fix clock will be on the DT.
Signed-off-by: Tali Perry <tali.perry1@gmail.com>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
drivers/clk/clk-npcm7xx.c | 39 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 38 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/clk-npcm7xx.c b/drivers/clk/clk-npcm7xx.c
index 27a86b7a34db..4bd2e40997d4 100644
--- a/drivers/clk/clk-npcm7xx.c
+++ b/drivers/clk/clk-npcm7xx.c
@@ -8,13 +8,19 @@
*/
#include <linux/module.h>
+#include <linux/clk.h>
#include <linux/clk-provider.h>
+#include <linux/device.h>
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/of_platform.h>
#include <linux/of_address.h>
+#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/err.h>
+#include <linux/rational.h>
#include <linux/bitfield.h>
#include <dt-bindings/clock/nuvoton,npcm7xx-clock.h>
@@ -544,6 +550,7 @@ static void __init npcm7xx_clk_init(struct device_node *clk_np)
void __iomem *clk_base;
struct resource res;
struct clk_hw *hw;
+ struct clk *clk;
int ret;
int i;
@@ -568,6 +575,31 @@ static void __init npcm7xx_clk_init(struct device_node *clk_np)
for (i = 0; i < NPCM7XX_NUM_CLOCKS; i++)
npcm7xx_clk_data->hws[i] = ERR_PTR(-EPROBE_DEFER);
+ /* Read fixed clocks. These 3 clocks must be defined in DT */
+ clk = of_clk_get_by_name(clk_np, NPCM7XX_CLK_S_REFCLK);
+ if (IS_ERR(clk)) {
+ pr_err("failed to find external REFCLK on device tree, err=%ld\n",
+ PTR_ERR(clk));
+ clk_put(clk);
+ goto npcm7xx_init_fail_no_clk_on_dt;
+ }
+
+ clk = of_clk_get_by_name(clk_np, NPCM7XX_CLK_S_SYSBYPCK);
+ if (IS_ERR(clk)) {
+ pr_err("failed to find external SYSBYPCK on device tree, err=%ld\n",
+ PTR_ERR(clk));
+ clk_put(clk);
+ goto npcm7xx_init_fail_no_clk_on_dt;
+ }
+
+ clk = of_clk_get_by_name(clk_np, NPCM7XX_CLK_S_MCBYPCK);
+ if (IS_ERR(clk)) {
+ pr_err("failed to find external MCBYPCK on device tree, err=%ld\n",
+ PTR_ERR(clk));
+ clk_put(clk);
+ goto npcm7xx_init_fail_no_clk_on_dt;
+ }
+
/* Register plls */
for (i = 0; i < ARRAY_SIZE(npcm7xx_plls); i++) {
const struct npcm7xx_clk_pll_data *pll_data = &npcm7xx_plls[i];
@@ -646,11 +678,16 @@ static void __init npcm7xx_clk_init(struct device_node *clk_np)
return;
+npcm7xx_init_fail_no_clk_on_dt:
+ pr_err("see Documentation/devicetree/bindings/clock/");
+ pr_err("nuvoton,npcm750-clk.txt for details\n");
npcm7xx_init_fail:
- kfree(npcm7xx_clk_data->hws);
+ if (npcm7xx_clk_data->num)
+ kfree(npcm7xx_clk_data->hws);
npcm7xx_init_np_err:
iounmap(clk_base);
npcm7xx_init_error:
of_node_put(clk_np);
+ pr_err("clk setup fail\n");
}
CLK_OF_DECLARE(npcm7xx_clk_init, "nuvoton,npcm750-clk", npcm7xx_clk_init);
--
2.14.1
next reply other threads:[~2018-12-06 8:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-06 8:44 Tali Perry [this message]
2018-12-06 18:49 ` [PATCH v2] clk: npcm7xx: get fixed clocks from DT Stephen Boyd
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=20181206084431.315559-1-tali.perry1@gmail.com \
--to=tali.perry1@gmail.com \
--cc=avifishman70@gmail.com \
--cc=brendanhiggins@google.com \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=openbmc@lists.ozlabs.org \
--cc=sboyd@kernel.org \
--cc=tmaimon77@gmail.com \
--cc=venture@google.com \
--cc=weiyongjun1@huawei.com \
--cc=yuenn@google.com \
/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).