summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-01-12 23:39:08 +0100
committerWolfgang Denk <wd@denx.de>2010-01-12 23:39:08 +0100
commitc76b64666e2b0d9d4eb8befc686c769db640533c (patch)
treebc8e9d2c5610d58424b645abb394a7303084dfcb /board
parent02c631e6eec5439daea46f8cbdb1572b0df3c843 (diff)
parent321790f61bb92fead0fc01b8d055aa331d8dcf85 (diff)
downloadu-boot-imx-c76b64666e2b0d9d4eb8befc686c769db640533c.zip
u-boot-imx-c76b64666e2b0d9d4eb8befc686c769db640533c.tar.gz
u-boot-imx-c76b64666e2b0d9d4eb8befc686c769db640533c.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'board')
-rw-r--r--board/davinci/da830evm/da830evm.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/board/davinci/da830evm/da830evm.c b/board/davinci/da830evm/da830evm.c
index bb8cc3c..7cf6013 100644
--- a/board/davinci/da830evm/da830evm.c
+++ b/board/davinci/da830evm/da830evm.c
@@ -65,6 +65,11 @@ const struct pinmux_config i2c_pins[] = {
{ pinmux[9], 2, 4 }
};
+/* USB0_DRVVBUS pin muxer settings */
+const struct pinmux_config usb_pins[] = {
+ { pinmux[9], 1, 1 }
+};
+
int board_init(void)
{
#ifndef CONFIG_USE_IRQ
@@ -118,6 +123,9 @@ int board_init(void)
if (davinci_configure_pin_mux(i2c_pins, ARRAY_SIZE(i2c_pins)) != 0)
return 1;
+ if (davinci_configure_pin_mux(usb_pins, ARRAY_SIZE(usb_pins)) != 0)
+ return 1;
+
/* enable the console UART */
writel((DAVINCI_UART_PWREMU_MGMT_FREE | DAVINCI_UART_PWREMU_MGMT_URRST |
DAVINCI_UART_PWREMU_MGMT_UTRST),