Signed-off-by: pieter <p.grimmerink@inepro.com>
---
 arch/arm/mach-pxa/colibri-pxa300.c |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-pxa/colibri-pxa300.c 
b/arch/arm/mach-pxa/colibri-pxa300.c
index e7762ae..381857d 100644
--- a/arch/arm/mach-pxa/colibri-pxa300.c
+++ b/arch/arm/mach-pxa/colibri-pxa300.c
@@ -170,6 +170,33 @@ static inline void __init colibri_pxa310_init_ac97
(void)
 static inline void colibri_pxa310_init_ac97(void) {}
 #endif
 
+static mfp_cfg_t colibri_pxa300_uart_pin_config[] __initdata = {
+	/* FFUART */
+	GPIO99_UART1_RXD,
+	GPIO100_UART1_TXD,
+	GPIO101_UART1_CTS,
+	GPIO102_UART1_DCD,
+	GPIO103_UART1_DTR,
+	GPIO104_UART1_RI,
+	GPIO105_UART1_DSR,
+	GPIO106_UART1_RTS,
+
+	/* BTUART */
+	GPIO111_UART2_CTS,
+	GPIO112_UART2_RXD,
+	GPIO113_UART2_TXD,
+	GPIO114_UART2_RTS,
+
+	/* STUART */
+	GPIO8_UART3_TXD,
+	GPIO110_UART3_RXD,
+};
+
+static void __init colibri_pxa300_init_uart(void)
+{
+	pxa3xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa300_uart_pin_config));
+}
+
 void __init colibri_pxa300_init(void)
 {
 	pxa_set_ffuart_info(NULL);
@@ -184,6 +211,7 @@ void __init colibri_pxa300_init(void)
 	colibri_pxa310_init_ac97();
 	colibri_pxa3xx_init_mmc(ARRAY_AND_SIZE(colibri_pxa300_mmc_pin_config),
 				mfp_to_gpio(MFP_PIN_GPIO13));
+	colibri_pxa300_init_uart();
 }
 
 MACHINE_START(COLIBRI300, "Toradex Colibri PXA300")
-- 
1.6.5.rc1.44.ga1675