projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'u-boot/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
arch
/
arm
/
cpu
/
armv7
/
omap3
/
clock.c
diff --git
a/arch/arm/cpu/armv7/omap3/clock.c
b/arch/arm/cpu/armv7/omap3/clock.c
index 14fc7e8e810157810b37d2c65820c5cb5464ccd1..1bc27bdc7fdabc81a599eb012a65d8b783c6b45f 100644
(file)
--- a/
arch/arm/cpu/armv7/omap3/clock.c
+++ b/
arch/arm/cpu/armv7/omap3/clock.c
@@
-730,8
+730,6
@@
void per_clocks_enable(void)
sr32(&prcm_base->fclken_cam, 0, 32, FCK_CAM_ON);
sr32(&prcm_base->iclken_cam, 0, 32, ICK_CAM_ON);
}
- sr32(&prcm_base->fclken_per, 0, 32, FCK_PER_ON);
- sr32(&prcm_base->iclken_per, 0, 32, ICK_PER_ON);
sdelay(1000);
}