Skip to content

Commit

Permalink
clk: rockchip: fix rk3288 pll status register location
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jianqun authored and Heiko Stuebner committed Sep 27, 2014
1 parent 11ff376 commit ee17eb8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/clk/rockchip/clk-rk3288.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit ee17eb8

Please sign in to comment.