diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-03 14:01:02 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-03 14:01:02 +0200 |
| commit | 6d4511b2c6734842de9de21c1bc0db4c3ea28b72 (patch) | |
| tree | c676e6d3847b50f44f87afab50dc125fae6f1b84 /arch/arm/cpu/armv7/zynq/slcr.c | |
| parent | fb18fa95a14ae875ef0a5421cd9fecc00c7c3a4c (diff) | |
| parent | 2d83d33a51926d6471eb9282d03d83783850d565 (diff) | |
| download | talos-obmc-uboot-6d4511b2c6734842de9de21c1bc0db4c3ea28b72.tar.gz talos-obmc-uboot-6d4511b2c6734842de9de21c1bc0db4c3ea28b72.zip | |
Merge 'u-boot-microblaze/zynq' into (u-boot-arm/master'
Conflicts:
arch/arm/include/asm/arch-zynq/hardware.h
The conflict above was trivial and solved during merge.
Diffstat (limited to 'arch/arm/cpu/armv7/zynq/slcr.c')
| -rw-r--r-- | arch/arm/cpu/armv7/zynq/slcr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/zynq/slcr.c b/arch/arm/cpu/armv7/zynq/slcr.c index e5fe992982..717ec65aee 100644 --- a/arch/arm/cpu/armv7/zynq/slcr.c +++ b/arch/arm/cpu/armv7/zynq/slcr.c @@ -70,7 +70,7 @@ void zynq_slcr_gem_clk_setup(u32 gem_id, u32 rclk, u32 clk) /* Configure GEM_RCLK_CTRL */ writel(rclk, &slcr_base->gem0_rclk_ctrl); } - + udelay(100000); out: zynq_slcr_lock(); } |
