diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-04 14:06:56 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-04 14:06:56 +0200 |
commit | e62d5fb0da76ef168e90cae9bbbda80349aaf137 (patch) | |
tree | b5c338d17f0633b7ec2e27d4d8b82dcf153a5281 /arch/arm/cpu/armv7/omap3/clock.c | |
parent | 4eef93da262048eb1118e726b3ec5b8ebd3c6c91 (diff) | |
parent | 901ce27c6f018992b7dd6c08d3c98cf217cc4c96 (diff) | |
download | u-boot-imx-e62d5fb0da76ef168e90cae9bbbda80349aaf137.zip u-boot-imx-e62d5fb0da76ef168e90cae9bbbda80349aaf137.tar.gz u-boot-imx-e62d5fb0da76ef168e90cae9bbbda80349aaf137.tar.bz2 |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7/omap3/clock.c')
-rw-r--r-- | arch/arm/cpu/armv7/omap3/clock.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/cpu/armv7/omap3/clock.c b/arch/arm/cpu/armv7/omap3/clock.c index e903ed9..9f989ff 100644 --- a/arch/arm/cpu/armv7/omap3/clock.c +++ b/arch/arm/cpu/armv7/omap3/clock.c @@ -183,8 +183,7 @@ static void dpll3_init_34xx(u32 sil_index, u32 clk_index) * if running from flash, jump to small relocated code * area in SRAM. */ - f_lock_pll = (void *) ((u32) &_end_vect - (u32) &_start + - SRAM_VECT_CODE); + f_lock_pll = (void *) (SRAM_CLK_CODE); p0 = readl(&prcm_base->clken_pll); sr32(&p0, 0, 3, PLL_FAST_RELOCK_BYPASS); @@ -401,8 +400,7 @@ static void dpll3_init_36xx(u32 sil_index, u32 clk_index) * if running from flash, jump to small relocated code * area in SRAM. */ - f_lock_pll = (void *) ((u32) &_end_vect - (u32) &_start + - SRAM_VECT_CODE); + f_lock_pll = (void *) (SRAM_CLK_CODE); p0 = readl(&prcm_base->clken_pll); sr32(&p0, 0, 3, PLL_FAST_RELOCK_BYPASS); |