projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: omap: merge GPMC initialization code for all platform
[oweals/u-boot.git]
/
arch
/
arm
/
cpu
/
armv7
/
omap3
/
board.c
diff --git
a/arch/arm/cpu/armv7/omap3/board.c
b/arch/arm/cpu/armv7/omap3/board.c
index 7d1f8d9d2c33758d6bdb3b9232dad562ff605248..9bb1a1c8f9af6d49345d0996f335126935a3fcb2 100644
(file)
--- a/
arch/arm/cpu/armv7/omap3/board.c
+++ b/
arch/arm/cpu/armv7/omap3/board.c
@@
-98,7
+98,7
@@
void spl_board_init(void)
gpmc_init();
#endif
#ifdef CONFIG_SPL_I2C_SUPPORT
gpmc_init();
#endif
#ifdef CONFIG_SPL_I2C_SUPPORT
- i2c_init(CONFIG_SYS_
I2C_SPEED, CONFIG_SYS
_I2C_SLAVE);
+ i2c_init(CONFIG_SYS_
OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24
_I2C_SLAVE);
#endif
}
#endif /* CONFIG_SPL_BUILD */
#endif
}
#endif /* CONFIG_SPL_BUILD */
@@
-290,8
+290,8
@@
void watchdog_init(void)
* should not be running and does not generate a PRCM reset.
*/
* should not be running and does not generate a PRCM reset.
*/
- s
r32(&prcm_base->fclken_wkup, 5, 1, 1
);
- s
r32(&prcm_base->iclken_wkup, 5, 1, 1
);
+ s
etbits_le32(&prcm_base->fclken_wkup, 0x20
);
+ s
etbits_le32(&prcm_base->iclken_wkup, 0x20
);
wait_on_value(ST_WDT2, 0x20, &prcm_base->idlest_wkup, 5);
writel(WD_UNLOCK1, &wd2_base->wspr);
wait_on_value(ST_WDT2, 0x20, &prcm_base->idlest_wkup, 5);
writel(WD_UNLOCK1, &wd2_base->wspr);