From: stefan@agner.ch (Stefan Agner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] clk: imx: return correct frequency for Ethernet PLL
Date: Fri, 29 Jan 2016 14:49:24 -0800 [thread overview]
Message-ID: <1454107764-19876-2-git-send-email-stefan@agner.ch> (raw)
In-Reply-To: <1454107764-19876-1-git-send-email-stefan@agner.ch>
The i.MX 7 designs Ethernet PLL provides a 1000MHz reference clock.
Store the reference clock in the clk_pllv3 structure according to
the PLL type.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
drivers/clk/imx/clk-pllv3.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c
index b5ff561..c344ae6 100644
--- a/drivers/clk/imx/clk-pllv3.c
+++ b/drivers/clk/imx/clk-pllv3.c
@@ -44,6 +44,7 @@ struct clk_pllv3 {
u32 powerdown;
u32 div_mask;
u32 div_shift;
+ unsigned long ref_clock;
};
#define to_clk_pllv3(_hw) container_of(_hw, struct clk_pllv3, hw)
@@ -289,7 +290,9 @@ static const struct clk_ops clk_pllv3_av_ops = {
static unsigned long clk_pllv3_enet_recalc_rate(struct clk_hw *hw,
unsigned long parent_rate)
{
- return 500000000;
+ struct clk_pllv3 *pll = to_clk_pllv3(hw);
+
+ return pll->ref_clock;
}
static const struct clk_ops clk_pllv3_enet_ops = {
@@ -329,7 +332,11 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name,
break;
case IMX_PLLV3_ENET_IMX7:
pll->powerdown = IMX7_ENET_PLL_POWER;
+ pll->ref_clock = 1000000000;
+ ops = &clk_pllv3_enet_ops;
+ break;
case IMX_PLLV3_ENET:
+ pll->ref_clock = 500000000;
ops = &clk_pllv3_enet_ops;
break;
default:
--
2.7.0
next prev parent reply other threads:[~2016-01-29 22:49 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-29 22:49 [PATCH 1/2] clk: imx: do not sleep if IRQ's are still disabled Stefan Agner
2016-01-29 22:49 ` Stefan Agner [this message]
2016-01-29 23:35 ` Joshua Clayton
2016-01-30 1:16 ` Stephen Boyd
2016-04-26 17:04 ` Stefan Agner
2016-04-16 1:00 ` Stephen Boyd
2016-04-18 1:58 ` Shawn Guo
2016-04-21 3:45 ` Dong Aisheng
2016-04-26 1:23 ` Shawn Guo
2016-04-26 5:51 ` Dong Aisheng
2016-04-26 9:24 ` Shawn Guo
2016-04-26 9:31 ` Lucas Stach
2016-04-26 11:16 ` Dong Aisheng
2016-04-26 11:27 ` Dong Aisheng
2016-04-27 1:58 ` Shawn Guo
2016-04-27 2:45 ` Dong Aisheng
2016-04-27 2:56 ` Fabio Estevam
2016-04-27 7:28 ` Stefan Agner
2016-04-27 8:53 ` Dong Aisheng
2016-04-27 2:57 ` Dong Aisheng
2016-04-27 7:24 ` Shawn Guo
2016-04-27 7:26 ` Stefan Agner
2016-04-27 8:48 ` Dong Aisheng
2016-04-27 7:34 ` Stefan Agner
2016-04-27 8:57 ` Dong Aisheng
2016-04-27 10:15 ` Thomas Gleixner
2016-04-29 9:45 ` [RFC PATCH 1/1] clk: imx7d: move clk setting out of imx7d_clocks_init Dong Aisheng
2016-04-29 9:55 ` Dong Aisheng
2016-04-29 12:31 ` Lucas Stach
2016-04-30 2:04 ` Stefan Agner
2016-06-02 15:19 ` Dong Aisheng
2016-05-25 21:54 ` [PATCH 1/2] clk: imx: do not sleep if IRQ's are still disabled Stefan Agner
2016-06-02 14:59 ` Dong Aisheng
2016-06-06 13:20 ` Thomas Gleixner
2016-06-07 7:04 ` Dong Aisheng
2016-06-09 20:08 ` Thomas Gleixner
2016-06-09 22:14 ` Stefan Agner
2016-06-09 22:55 ` Thomas Gleixner
2016-06-12 12:24 ` Dong Aisheng
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=1454107764-19876-2-git-send-email-stefan@agner.ch \
--to=stefan@agner.ch \
--cc=linux-arm-kernel@lists.infradead.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).