]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
clk: rockchip: fix rk3288 pll status register location
authorJianqun <jay.xu@rock-chips.com>
Mon, 1 Sep 2014 21:56:28 +0000 (23:56 +0200)
committerHeiko Stuebner <heiko@sntech.de>
Sat, 27 Sep 2014 15:57:10 +0000 (17:57 +0200)
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>
drivers/clk/rockchip/clk-rk3288.c

index 21a5c74f1bec6c8dee04b3cc50706a51e23b9e63..12112899ff51c246d7b6eac1c5f68a9010119012 100644 (file)
@@ -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,
@@ -733,7 +733,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,