diff options
| author | Tom Rini <trini@ti.com> | 2014-09-12 11:27:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-09-12 11:27:46 -0400 |
| commit | 114cc4290b2f24bb314edf2edd5d8738a0778c4b (patch) | |
| tree | e3ca947656fea69adb810bab0ee5a32c0d413919 /arch/arm/cpu/armv7/keystone/clock.c | |
| parent | b7a809957bcd72c2efa49ce733774b1e28878585 (diff) | |
| parent | a7f99bf139b3aaa0d5494693fd0395084355e41a (diff) | |
| download | blackbird-obmc-uboot-114cc4290b2f24bb314edf2edd5d8738a0778c4b.tar.gz blackbird-obmc-uboot-114cc4290b2f24bb314edf2edd5d8738a0778c4b.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/keystone/clock.c')
| -rw-r--r-- | arch/arm/cpu/armv7/keystone/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/keystone/clock.c b/arch/arm/cpu/armv7/keystone/clock.c index 30d76a6603..47fc89398d 100644 --- a/arch/arm/cpu/armv7/keystone/clock.c +++ b/arch/arm/cpu/armv7/keystone/clock.c @@ -174,7 +174,7 @@ void init_pll(const struct pll_init_data *data) * bypass disabled */ bwadj = pllm >> 1; - tmp |= ((bwadj & PLL_BWADJ_LO_SHIFT) << PLL_BWADJ_LO_SHIFT) | + tmp |= ((bwadj & PLL_BWADJ_LO_MASK) << PLL_BWADJ_LO_SHIFT) | (pllm << PLL_MULT_SHIFT) | (plld & PLL_DIV_MASK) | (pllod << PLL_CLKOD_SHIFT); |
