diff options
| author | Tom Rini <trini@ti.com> | 2013-04-18 16:16:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-04-18 16:16:01 -0400 |
| commit | 17dcbfb0876385b13739b1b1f2026edc8163b629 (patch) | |
| tree | 5faa5949a895040398e70f6e8ef81dc9da88557e /arch/arm/cpu/arm720t/tegra30/cpu.c | |
| parent | 669dfc2ed8d853d6bcdcafa1de6aca22929465e5 (diff) | |
| parent | f2e8a87305a55652488af140adcf65b1e688f287 (diff) | |
| download | blackbird-obmc-uboot-17dcbfb0876385b13739b1b1f2026edc8163b629.tar.gz blackbird-obmc-uboot-17dcbfb0876385b13739b1b1f2026edc8163b629.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm into HEAD
Quick manual fixup to merge the USB boot related defines and TPM related
defines.
Conflicts:
include/configs/exynos5250-dt.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/cpu/arm720t/tegra30/cpu.c')
| -rw-r--r-- | arch/arm/cpu/arm720t/tegra30/cpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/arm720t/tegra30/cpu.c b/arch/arm/cpu/arm720t/tegra30/cpu.c index dedcdd9b08..e162357484 100644 --- a/arch/arm/cpu/arm720t/tegra30/cpu.c +++ b/arch/arm/cpu/arm720t/tegra30/cpu.c @@ -110,8 +110,8 @@ void t30_init_clocks(void) reset_set_enable(PERIPH_ID_MSELECT, 1); clock_set_enable(PERIPH_ID_MSELECT, 1); - /* Switch MSELECT clock to PLLP (00) */ - clock_ll_set_source(PERIPH_ID_MSELECT, 0); + /* Switch MSELECT clock to PLLP (00) and use a divisor of 2 */ + clock_ll_set_source_divisor(PERIPH_ID_MSELECT, 0, 2); /* * Our high-level clock routines are not available prior to |
