summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorMarkus Klotzbuecher <mk@denx.de>2007-03-23 09:52:17 +0100
committerMarkus Klotzbuecher <mk@pollux.denx.de>2007-03-23 09:52:17 +0100
commitf2b07ebd32e42a5b1126c98efc768ddb8908de62 (patch)
treee2a374a15d0abf6872fbbdeecf8e34855e56d3c9 /board
parent44ba464b99001f8bd1c456a1e9d59726252f707a (diff)
parent83dc830b1693252d996bda920cd5f3161d7c64a9 (diff)
downloadu-boot-imx-f2b07ebd32e42a5b1126c98efc768ddb8908de62.zip
u-boot-imx-f2b07ebd32e42a5b1126c98efc768ddb8908de62.tar.gz
u-boot-imx-f2b07ebd32e42a5b1126c98efc768ddb8908de62.tar.bz2
Merge with git://www.denx.de/git/u-boot.git#testing-USB
Diffstat (limited to 'board')
-rw-r--r--board/delta/delta.c15
-rw-r--r--board/trab/auto_update.c2
2 files changed, 9 insertions, 8 deletions
diff --git a/board/delta/delta.c b/board/delta/delta.c
index b127ac8..6e22774 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 f4074ae..6f903d2 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