summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2014-03-25 14:49:48 +0100
committerTom Rini <trini@ti.com>2014-04-17 14:39:54 -0400
commite7300f463d0c5f414d4cb717cad925554564a92e (patch)
tree7311fc2837cf1e3d577af94e8766dd38263a7284 /arch
parent1b82491ee6ee1e986e5521b33692a00e1f38fe75 (diff)
downloadtalos-obmc-uboot-e7300f463d0c5f414d4cb717cad925554564a92e.tar.gz
talos-obmc-uboot-e7300f463d0c5f414d4cb717cad925554564a92e.zip
ARM: OMAP: remove sr32() from OMAP board code
Replace the custom sr32() bit manipulation function in arch/arm/cpu/armv7/omap3/board.c and board/ti/panda/panda.c by standard I/O accessors. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Tom Rini <trini@ti.com> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/armv7/omap3/board.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c
index 29228160c3..9bb1a1c8f9 100644
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@ -290,8 +290,8 @@ void watchdog_init(void)
* should not be running and does not generate a PRCM reset.
*/
- sr32(&prcm_base->fclken_wkup, 5, 1, 1);
- sr32(&prcm_base->iclken_wkup, 5, 1, 1);
+ setbits_le32(&prcm_base->fclken_wkup, 0x20);
+ setbits_le32(&prcm_base->iclken_wkup, 0x20);
wait_on_value(ST_WDT2, 0x20, &prcm_base->idlest_wkup, 5);
writel(WD_UNLOCK1, &wd2_base->wspr);
OpenPOWER on IntegriCloud