diff options
author | Wolfgang Denk <wd@denx.de> | 2009-07-30 00:36:25 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-07-30 00:36:25 +0200 |
commit | 108f56b056780f0d23f720d98709304f84a0d6c8 (patch) | |
tree | 2a2eb0ab998cfdbf6275dcf282ab282056a14f30 /board/omap3/zoom1/zoom1.c | |
parent | 4c2e3da82dc2b7f8b39b7f1d57f570e4bc5caa6d (diff) | |
parent | bb4291e62579dbc611e84eaaf973631e0bf129c7 (diff) | |
download | u-boot-imx-108f56b056780f0d23f720d98709304f84a0d6c8.zip u-boot-imx-108f56b056780f0d23f720d98709304f84a0d6c8.tar.gz u-boot-imx-108f56b056780f0d23f720d98709304f84a0d6c8.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'board/omap3/zoom1/zoom1.c')
-rw-r--r-- | board/omap3/zoom1/zoom1.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/board/omap3/zoom1/zoom1.c b/board/omap3/zoom1/zoom1.c index db4d087..f4d3754 100644 --- a/board/omap3/zoom1/zoom1.c +++ b/board/omap3/zoom1/zoom1.c @@ -31,6 +31,7 @@ * MA 02111-1307 USA */ #include <common.h> +#include <twl4030.h> #include <asm/io.h> #include <asm/arch/mux.h> #include <asm/arch/sys_proto.h> @@ -60,8 +61,17 @@ int board_init(void) */ int misc_init_r(void) { - power_init_r(); + twl4030_power_init(); + twl4030_led_init(); dieid_num_r(); + + /* + * Board Reset + * The board is reset by holding the red button on the + * top right front face for eight seconds. + */ + twl4030_power_reset_init(); + return 0; } |