summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-11-05 20:50:39 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-11-05 20:50:39 +0100
commitc0e5dd88c438a41bf180dde0c2dc4c67dcd8058d (patch)
treeda81a7a9b2616bfb0db1331089b390c7c92af247 /board
parentf6723794fd8f3362c4f3b5d0f36607a6a6f107b2 (diff)
parentc12f941bece9ed79efccfe9e4a9fd977da6975f9 (diff)
downloadblackbird-obmc-uboot-c0e5dd88c438a41bf180dde0c2dc4c67dcd8058d.tar.gz
blackbird-obmc-uboot-c0e5dd88c438a41bf180dde0c2dc4c67dcd8058d.zip
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
Diffstat (limited to 'board')
-rw-r--r--board/atmel/at91sam9n12ek/at91sam9n12ek.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
index 2ec32ebc21..9adc9920b4 100644
--- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c
+++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
@@ -199,6 +199,13 @@ void at91sam9n12ek_ks8851_hw_init(void)
}
#endif
+#ifdef CONFIG_USB_ATMEL
+void at91sam9n12ek_usb_hw_init(void)
+{
+ at91_set_pio_output(AT91_PIO_PORTB, 7, 0);
+}
+#endif
+
int board_early_init_f(void)
{
/* Enable clocks for all PIOs */
@@ -230,6 +237,10 @@ int board_init(void)
at91sam9n12ek_ks8851_hw_init();
#endif
+#ifdef CONFIG_USB_ATMEL
+ at91sam9n12ek_usb_hw_init();
+#endif
+
return 0;
}
OpenPOWER on IntegriCloud