commit 9aa720b1454ce0f4dab78ee5b81a5405c287e180
author Fabio Estevam <fabio.estevam@freescale.com> Wed Mar 02 10:14:27 2011 +0100
committer Albert ARIBAUD <albert.u.boot@aribaud.net> Wed Apr 27 19:38:05 2011 +0200
tree 7301eff40fbe7f575203f032ca4aa52aea80d926
parent 8640c984633de10f6d15211077496b3705df32d0

mx25: Make the UART port number explicit in its setup function

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

arch/arm/cpu/arm926ejs/mx25/generic.c

diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index c6e1146..76e4b5c 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -145,7 +145,7 @@
 }
 
 #ifdef CONFIG_MXC_UART
-void mx25_uart_init_pins (void)
+void mx25_uart1_init_pins(void)
 {
 	struct iomuxc_mux_ctl *muxctl;
 	struct iomuxc_pad_ctl *padctl;

board/karo/tx25/tx25.c

diff --git a/board/karo/tx25/tx25.c b/board/karo/tx25/tx25.c
index dc57d5c..269858c 100644
--- a/board/karo/tx25/tx25.c
+++ b/board/karo/tx25/tx25.c
@@ -141,9 +141,9 @@
 int board_init()
 {
 #ifdef CONFIG_MXC_UART
-	extern void mx25_uart_init_pins(void);
+	extern void mx25_uart1_init_pins(void);
 
-	mx25_uart_init_pins();
+	mx25_uart1_init_pins();
 #endif
 	/* board id for linux */
 	gd->bd->bi_arch_number = MACH_TYPE_TX25;