diff options
author | Jianqun <jay.xu@rock-chips.com> | 2014-09-01 17:56:28 -0400 |
---|---|---|
committer | Heiko Stuebner <heiko@sntech.de> | 2014-09-27 11:57:10 -0400 |
commit | ee17eb83c48e04653d8b430735f82fd4cdac6ca3 (patch) | |
tree | 1d35ef5ad89f6671ad59a4a9cfe01f8621ddbb6d | |
parent | 11ff376fcfc0135b8947d27ab80162c218d1af90 (diff) |
clk: rockchip: fix rk3288 pll status register location
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>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Tested-by: Doug Anderson <dianders@chromium.org>
-rw-r--r-- | drivers/clk/rockchip/clk-rk3288.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c index 21a5c74f1bec..12112899ff51 100644 --- a/drivers/clk/rockchip/clk-rk3288.c +++ b/drivers/clk/rockchip/clk-rk3288.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include "clk.h" | 20 | #include "clk.h" |
21 | 21 | ||
22 | #define RK3288_GRF_SOC_CON(x) (0x244 + x * 4) | 22 | #define RK3288_GRF_SOC_CON(x) (0x244 + x * 4) |
23 | #define RK3288_GRF_SOC_STATUS 0x280 | 23 | #define RK3288_GRF_SOC_STATUS1 0x284 |
24 | 24 | ||
25 | enum rk3288_plls { | 25 | enum rk3288_plls { |
26 | apll, dpll, cpll, gpll, npll, | 26 | apll, dpll, cpll, gpll, npll, |
@@ -733,7 +733,7 @@ static void __init rk3288_clk_init(struct device_node *np) | |||
733 | 733 | ||
734 | rockchip_clk_register_plls(rk3288_pll_clks, | 734 | rockchip_clk_register_plls(rk3288_pll_clks, |
735 | ARRAY_SIZE(rk3288_pll_clks), | 735 | ARRAY_SIZE(rk3288_pll_clks), |
736 | RK3288_GRF_SOC_STATUS); | 736 | RK3288_GRF_SOC_STATUS1); |
737 | rockchip_clk_register_branches(rk3288_clk_branches, | 737 | rockchip_clk_register_branches(rk3288_clk_branches, |
738 | ARRAY_SIZE(rk3288_clk_branches)); | 738 | ARRAY_SIZE(rk3288_clk_branches)); |
739 | rockchip_clk_protect_critical(rk3288_critical_clocks, | 739 | rockchip_clk_protect_critical(rk3288_critical_clocks, |