Merge git://git.denx.de/u-boot

[u-boot] / arch / arm / cpu / arm1136 / mx31 / devices.c

diff --git a/arch/arm/cpu/arm1136/mx31/devices.c b/arch/arm/cpu/arm1136/mx31/devices.c
index 1f4ca7eb44336ea5a3ba1f8665e41265c29ab06b..2ebee2e96028f9b760508e6bf9a0ac51843e6273 100644 (file)
--- a/arch/arm/cpu/arm1136/mx31/devices.c
+++ b/arch/arm/cpu/arm1136/mx31/devices.c
@@ -24,10 +24,9 @@
  */
 
 #include <common.h>
-#include <asm/arch/mx31-regs.h>
-#include <asm/arch/mx31.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/clock.h>
 
-#ifdef CONFIG_SYS_MX31_UART1
 void mx31_uart1_hw_init(void)
 {
        /* setup pins for UART1 */
@@ -36,9 +35,21 @@ void mx31_uart1_hw_init(void)
        mx31_gpio_mux(MUX_RTS1__UART1_RTS_B);
        mx31_gpio_mux(MUX_CTS1__UART1_CTS_B);
 }
-#endif
+
+void mx31_uart2_hw_init(void)
+{
+       /* setup pins for UART2 */
+       mx31_gpio_mux(MUX_RXD2__UART2_RXD_MUX);
+       mx31_gpio_mux(MUX_TXD2__UART2_TXD_MUX);
+       mx31_gpio_mux(MUX_RTS2__UART2_RTS_B);
+       mx31_gpio_mux(MUX_CTS2__UART2_CTS_B);
+}
 
 #ifdef CONFIG_MXC_SPI
+/*
+ * Note: putting several spi setups here makes no sense as they may differ
+ * at board level (physical pin SS0 of CSPI2 may aswell be used as SS0 of CSPI3)
+ */
 void mx31_spi2_hw_init(void)
 {
        /* SPI2 */