From: Heiko Stuebner <heiko@sntech.de>
To: linux-clk@vger.kernel.org
Cc: mturquette@baylibre.com, sboyd@kernel.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
finley.xiao@rock-chips.com, zhangqing@rock-chips.com,
christoph.muellner@theobroma-systems.com,
Heiko Stuebner <heiko@sntech.de>
Subject: [PATCH 3/5] clk: rockchip: move px30 critical clocks to correct clock controller
Date: Tue, 17 Sep 2019 10:19:01 +0200 [thread overview]
Message-ID: <20190917081903.25139-3-heiko@sntech.de> (raw)
In-Reply-To: <20190917081903.25139-1-heiko@sntech.de>
The clocks in the px30 critical clock section are from the regular cru not
the pmucru, so move them to the correct place.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
drivers/clk/rockchip/clk-px30.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/clk/rockchip/clk-px30.c b/drivers/clk/rockchip/clk-px30.c
index a973394f3d65..5c77da1e3abc 100644
--- a/drivers/clk/rockchip/clk-px30.c
+++ b/drivers/clk/rockchip/clk-px30.c
@@ -976,7 +976,7 @@ static struct rockchip_clk_branch px30_clk_pmu_branches[] __initdata = {
GATE(0, "pclk_cru_pmu", "pclk_pmu_pre", CLK_IGNORE_UNUSED, PX30_PMU_CLKGATE_CON(0), 8, GFLAGS),
};
-static const char *const px30_pmucru_critical_clocks[] __initconst = {
+static const char *const px30_cru_critical_clocks[] __initconst = {
"aclk_bus_pre",
"pclk_bus_pre",
"hclk_bus_pre",
@@ -1021,6 +1021,9 @@ static void __init px30_clk_init(struct device_node *np)
&px30_cpuclk_data, px30_cpuclk_rates,
ARRAY_SIZE(px30_cpuclk_rates));
+ rockchip_clk_protect_critical(px30_cru_critical_clocks,
+ ARRAY_SIZE(px30_cru_critical_clocks));
+
rockchip_register_softrst(np, 12, reg_base + PX30_SOFTRST_CON(0),
ROCKCHIP_SOFTRST_HIWORD_MASK);
@@ -1053,9 +1056,6 @@ static void __init px30_pmu_clk_init(struct device_node *np)
rockchip_clk_register_branches(ctx, px30_clk_pmu_branches,
ARRAY_SIZE(px30_clk_pmu_branches));
- rockchip_clk_protect_critical(px30_pmucru_critical_clocks,
- ARRAY_SIZE(px30_pmucru_critical_clocks));
-
rockchip_clk_of_add_provider(np, ctx);
}
CLK_OF_DECLARE(px30_cru_pmu, "rockchip,px30-pmucru", px30_pmu_clk_init);
--
2.20.1
next prev parent reply other threads:[~2019-09-17 8:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-17 8:18 [PATCH 1/5] clk: rockchip: Add div50 clock-ids for sdmmc on px30 and nandc Heiko Stuebner
2019-09-17 8:19 ` [PATCH 2/5] clk: rockchip: Add div50 clocks for px30 sdmmc, emmc, sdio " Heiko Stuebner
2019-09-17 8:19 ` Heiko Stuebner [this message]
2019-09-17 8:19 ` [PATCH 4/5] clk: rockchip: add video-related niu clocks as critical on px30 Heiko Stuebner
2019-09-17 8:19 ` [PATCH 5/5] clk: rockchip: protect the pclk_usb_grf as critical Heiko Stuebner
2019-11-08 16:38 ` [PATCH 1/5] clk: rockchip: Add div50 clock-ids for sdmmc on px30 and nandc Heiko Stübner
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=20190917081903.25139-3-heiko@sntech.de \
--to=heiko@sntech.de \
--cc=christoph.muellner@theobroma-systems.com \
--cc=finley.xiao@rock-chips.com \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@kernel.org \
--cc=zhangqing@rock-chips.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
all inboxes | Powered by JetHome®