Patchwork [U-Boot] mx25: Make the UART port number explicit in its setup function

login
register
mail settings
Submitter Fabio Estevam
Date Feb. 17, 2011, 7:50 p.m.
Message ID <1297972210-28684-1-git-send-email-fabio.estevam@freescale.com>
Download mbox | patch
Permalink /patch/83474/
State Accepted
Commit 9aa720b1454ce0f4dab78ee5b81a5405c287e180
Delegated to: Stefano Babic
Headers show

Comments

Fabio Estevam - Feb. 17, 2011, 7:50 p.m.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/cpu/arm926ejs/mx25/generic.c |    2 +-
 board/karo/tx25/tx25.c                |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index c6e1146..150eb69 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -145,7 +145,7 @@  int cpu_mmc_init (bd_t * bis)
 }
 
 #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;
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 @@  void tx25_fec_init(void)
 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;