diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-22 08:20:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-22 08:20:03 -0500 |
| commit | 80d307d1159b7edfc28b465e5a359c1dfb20566e (patch) | |
| tree | fc65889724eac5ec28d0229226ecd3edfb94a2e8 /arch/arm/cpu/armv7/sunxi/clock_sun6i.c | |
| parent | f3c71c93d71dbc8994648b7f7b98210df2d0a0a6 (diff) | |
| parent | aa56cb374de8ae83f3280fdd6c280724228b86d7 (diff) | |
| download | u-boot-imx-80d307d1159b7edfc28b465e5a359c1dfb20566e.zip u-boot-imx-80d307d1159b7edfc28b465e5a359c1dfb20566e.tar.gz u-boot-imx-80d307d1159b7edfc28b465e5a359c1dfb20566e.tar.bz2 | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/cpu/armv7/sunxi/clock_sun6i.c')
| -rw-r--r-- | arch/arm/cpu/armv7/sunxi/clock_sun6i.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/clock_sun6i.c b/arch/arm/cpu/armv7/sunxi/clock_sun6i.c index 3ab3b31..916ee48 100644 --- a/arch/arm/cpu/armv7/sunxi/clock_sun6i.c +++ b/arch/arm/cpu/armv7/sunxi/clock_sun6i.c @@ -34,9 +34,11 @@ void clock_init_safe(void) clock_set_pll1(408000000); - writel(AHB1_ABP1_DIV_DEFAULT, &ccm->ahb1_apb1_div); - writel(PLL6_CFG_DEFAULT, &ccm->pll6_cfg); + while (!(readl(&ccm->pll6_cfg) & CCM_PLL6_CTRL_LOCK)) + ; + + writel(AHB1_ABP1_DIV_DEFAULT, &ccm->ahb1_apb1_div); writel(MBUS_CLK_DEFAULT, &ccm->mbus0_clk_cfg); writel(MBUS_CLK_DEFAULT, &ccm->mbus1_clk_cfg); |