summaryrefslogtreecommitdiff
path: root/board/davinci/da830evm/da830evm.c
diff options
context:
space:
mode:
authorMichael Brandt <Michael.Brandt@stericsson.com>2010-01-13 17:34:25 +0100
committerMichael Brandt <Michael.Brandt@stericsson.com>2010-01-13 17:34:25 +0100
commitc8f05f17eb440b3ef88d9417bf02797475583737 (patch)
tree81e1bf25dd75b1bad7ba738dd15eb76d882912ea /board/davinci/da830evm/da830evm.c
parent074f516bda136e5464499fc63a854d8469f8e9fb (diff)
parent2ff6922280025c1315c53fa2eb4ab33f0c9591de (diff)
Merge branch 'master' of http://git.denx.de/u-boot
Diffstat (limited to 'board/davinci/da830evm/da830evm.c')
-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 bb8cc3c92..7cf601301 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),