diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-08-09 23:17:32 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-08-09 23:17:32 +0200 |
| commit | 19901c6320a07dfa33814c9cdb5b9f6511765079 (patch) | |
| tree | d85a6eec1ec2a4d94c61244ab85d72368305726e /board | |
| parent | 2c4faea84f3d96d674e3c065e1f220b20c8930c0 (diff) | |
| parent | 78549bbf44bd2c8d1a0730fb068836071751afaa (diff) | |
| download | blackbird-obmc-uboot-19901c6320a07dfa33814c9cdb5b9f6511765079.tar.gz blackbird-obmc-uboot-19901c6320a07dfa33814c9cdb5b9f6511765079.zip | |
Merge with /home/wd/git/u-boot/custodian/u-boot-usb
Diffstat (limited to 'board')
| -rw-r--r-- | board/delta/delta.c | 15 | ||||
| -rw-r--r-- | board/trab/auto_update.c | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/board/delta/delta.c b/board/delta/delta.c index b127ac8cab..6e227748b0 100644 --- a/board/delta/delta.c +++ b/board/delta/delta.c @@ -1,10 +1,6 @@ /* - * (C) Copyright 2002 - * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net - * - * (C) Copyright 2002 - * Sysgo Real-Time Solutions, GmbH <www.elinos.com> - * Marius Groeger <mgroeger@sysgo.de> + * (C) Copyright 2006 + * DENX Software Engineering * * See file CREDITS for list of people who contributed to this * project. @@ -98,7 +94,6 @@ int board_late_init(void) return 0; } - /* * Magic Key Handling, mainly copied from board/lwmon/lwmon.c */ @@ -324,6 +319,12 @@ static void init_DA9030() return; } + val = 0x80; + if(i2c_write(addr, IRQ_MASK_B, 1, &val, 1)) { + printf("Error accessing DA9030 via i2c.\n"); + return; + } + i2c_reg_write(addr, REG_CONTROL_1_97, 0xfd); /* disable LDO1, enable LDO6 */ i2c_reg_write(addr, LDO2_3, 0xd1); /* LDO2 =1,9V, LDO3=3,1V */ i2c_reg_write(addr, LDO4_5, 0xcc); /* LDO2 =1,9V, LDO3=3,1V */ diff --git a/board/trab/auto_update.c b/board/trab/auto_update.c index ef40c54748..92120b0d01 100644 --- a/board/trab/auto_update.c +++ b/board/trab/auto_update.c @@ -34,7 +34,7 @@ #ifdef CONFIG_AUTO_UPDATE -#ifndef CONFIG_USB_OHCI +#ifndef CONFIG_USB_OHCI_NEW #error "must define CONFIG_USB_OHCI" #endif |
