summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-01-09 20:01:48 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-01-09 20:01:48 +0100
commit612404c28a64a6df300642a1550a65dcc8e01f82 (patch)
tree5be664967ba39c93dc27da5cc547d350e7c0fc17 /arch/arm/cpu
parentea33fb1a32e8e3f408b311823cabbb7453148f80 (diff)
parentac81e1ccf7135d8004763bbf9bef1d95a03fbe92 (diff)
downloadtalos-obmc-uboot-612404c28a64a6df300642a1550a65dcc8e01f82.tar.gz
talos-obmc-uboot-612404c28a64a6df300642a1550a65dcc8e01f82.zip
Merge 'u-boot-atmel/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r--arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c
index 93485523b5..0448c0b133 100644
--- a/arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c
+++ b/arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c
@@ -193,6 +193,19 @@ void at91_spi1_hw_init(unsigned long cs_mask)
}
#endif
+#if defined(CONFIG_USB_OHCI_NEW) || defined(CONFIG_USB_EHCI)
+void at91_uhp_hw_init(void)
+{
+ /* Enable VBus on UHP ports */
+ at91_set_pio_output(AT91_PIO_PORTD, 18, 0); /* port A */
+ at91_set_pio_output(AT91_PIO_PORTD, 19, 0); /* port B */
+#if defined(CONFIG_USB_OHCI_NEW)
+ /* port C is OHCI only */
+ at91_set_pio_output(AT91_PIO_PORTD, 20, 0); /* port C */
+#endif
+}
+#endif
+
#ifdef CONFIG_MACB
void at91_macb_hw_init(void)
{
OpenPOWER on IntegriCloud