From: heiko@sntech.de (Heiko Stuebner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 2/7] clk: rockchip: fix rk3288 pll status register location
Date: Sat, 13 Sep 2014 00:30:25 +0200 [thread overview]
Message-ID: <1410561030-19127-3-git-send-email-heiko@sntech.de> (raw)
In-Reply-To: <1410561030-19127-1-git-send-email-heiko@sntech.de>
From: Jianqun <jay.xu@rock-chips.com>
In RK3288, APLL lock status bit is in GRF_SOC_STATUS1,
but in RK3188, is GRFSOC_STATUS0.
Signed-off-by: Jianqun <jay.xu@rock-chips.com>
Also name the constant accordingly as GRF_SOC_STATUS1
to prevent confusion.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
drivers/clk/rockchip/clk-rk3288.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
index 08c24c6..b023425 100644
--- a/drivers/clk/rockchip/clk-rk3288.c
+++ b/drivers/clk/rockchip/clk-rk3288.c
@@ -20,7 +20,7 @@
#include "clk.h"
#define RK3288_GRF_SOC_CON(x) (0x244 + x * 4)
-#define RK3288_GRF_SOC_STATUS 0x280
+#define RK3288_GRF_SOC_STATUS1 0x284
enum rk3288_plls {
apll, dpll, cpll, gpll, npll,
@@ -713,7 +713,7 @@ static void __init rk3288_clk_init(struct device_node *np)
rockchip_clk_register_plls(rk3288_pll_clks,
ARRAY_SIZE(rk3288_pll_clks),
- RK3288_GRF_SOC_STATUS);
+ RK3288_GRF_SOC_STATUS1);
rockchip_clk_register_branches(rk3288_clk_branches,
ARRAY_SIZE(rk3288_clk_branches));
rockchip_clk_protect_critical(rk3288_critical_clocks,
--
2.0.1
next prev parent reply other threads:[~2014-09-12 22:30 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-12 22:30 [PATCH v2 0/7] ARM: Rockchip: add cpuclk handling - clock-tree part Heiko Stuebner
2014-09-12 22:30 ` [PATCH v2 1/7] clk: rockchip: fix rk3066 pll status register location Heiko Stuebner
2014-09-12 22:30 ` Heiko Stuebner [this message]
2014-09-12 23:46 ` [PATCH v2 2/7] clk: rockchip: fix rk3288 " Doug Anderson
2014-09-12 22:30 ` [PATCH v2 3/7] clk: rockchip: reparent aclk_cpu_pre to the gpll Heiko Stuebner
2014-09-12 22:30 ` [PATCH v2 4/7] clk: rockchip: make tightly bound armclk child-clocks read-only Heiko Stuebner
2014-09-12 23:52 ` Doug Anderson
2014-09-12 22:30 ` [PATCH v2 5/7] clk: rockchip: add new clock-type for the cpuclk Heiko Stuebner
2014-09-15 23:58 ` Doug Anderson
2014-09-16 0:49 ` Doug Anderson
2014-09-16 9:49 ` Karl Palsson
2014-09-16 1:00 ` Kever Yang
2014-09-16 4:37 ` Doug Anderson
2014-09-12 22:30 ` [PATCH v2 6/7] clk: rockchip: add binding id for ARMCLK Heiko Stuebner
2014-09-13 0:10 ` Doug Anderson
2014-09-12 22:30 ` [PATCH v2 7/7] clk: rockchip: switch to using the new cpuclk type for armclk Heiko Stuebner
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=1410561030-19127-3-git-send-email-heiko@sntech.de \
--to=heiko@sntech.de \
--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).