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/zoom2/zoom2.c | |
| parent | 4c2e3da82dc2b7f8b39b7f1d57f570e4bc5caa6d (diff) | |
| parent | bb4291e62579dbc611e84eaaf973631e0bf129c7 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'board/omap3/zoom2/zoom2.c')
| -rw-r--r-- | board/omap3/zoom2/zoom2.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/board/omap3/zoom2/zoom2.c b/board/omap3/zoom2/zoom2.c index 08fdafb644..94a985dcb3 100644 --- a/board/omap3/zoom2/zoom2.c +++ b/board/omap3/zoom2/zoom2.c @@ -32,6 +32,7 @@ #ifdef CONFIG_STATUS_LED #include <status_led.h> #endif +#include <twl4030.h> #include <asm/io.h> #include <asm/arch/gpio.h> #include <asm/arch/mem.h> @@ -154,8 +155,22 @@ int board_init (void) int misc_init_r(void) { zoom2_identify(); - power_init_r(); + twl4030_power_init(); + twl4030_led_init(); dieid_num_r(); + + /* + * Board Reset + * The board is reset by holding the the large button + * on the top right side of the main board for + * eight seconds. + * + * There are reported problems of some beta boards + * continously resetting. For those boards, disable resetting. + */ + if (ZOOM2_REVISION_PRODUCTION <= zoom2_get_revision()) + twl4030_power_reset_init(); + return 0; } |