Patchwork [U-Boot] mx27: Make the UART port number explicit

login
register
mail settings
Submitter Fabio Estevam
Date July 1, 2011, 5:15 p.m.
Message ID <1309540552-17352-1-git-send-email-fabio.estevam@freescale.com>
Download mbox | patch
Permalink /patch/102929/
State Accepted
Commit 3f7bfbdd3c4df9e0ea8157b0853c791f9b839349
Delegated to: Stefano Babic
Headers show

Comments

Fabio Estevam - July 1, 2011, 5:15 p.m.
mx27_uart_init_pins does the IOMUX setting for UART1 port.

Change the function name to make the UART port number explicit.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/cpu/arm926ejs/mx27/generic.c     |    2 +-
 arch/arm/include/asm/arch-mx27/imx-regs.h |    2 +-
 board/logicpd/imx27lite/imx27lite.c       |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
Stefano Babic - July 6, 2011, 6:47 a.m.
On 07/01/2011 07:15 PM, Fabio Estevam wrote:
> mx27_uart_init_pins does the IOMUX setting for UART1 port.
> 
> Change the function name to make the UART port number explicit.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Patch

diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c
index 27642bf..222a8e9 100644
--- a/arch/arm/cpu/arm926ejs/mx27/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx27/generic.c
@@ -271,7 +271,7 @@  void imx_gpio_mode(int gpio_mode)
 }
 
 #ifdef CONFIG_MXC_UART
-void mx27_uart_init_pins(void)
+void mx27_uart1_init_pins(void)
 {
 	int i;
 	unsigned int mode[] = {
diff --git a/arch/arm/include/asm/arch-mx27/imx-regs.h b/arch/arm/include/asm/arch-mx27/imx-regs.h
index 8f40aa7..b4b2fe6 100644
--- a/arch/arm/include/asm/arch-mx27/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx27/imx-regs.h
@@ -29,7 +29,7 @@ 
 extern void imx_gpio_mode (int gpio_mode);
 
 #ifdef CONFIG_MXC_UART
-extern void mx27_uart_init_pins(void);
+extern void mx27_uart1_init_pins(void);
 #endif /* CONFIG_MXC_UART */
 
 #ifdef CONFIG_FEC_MXC
diff --git a/board/logicpd/imx27lite/imx27lite.c b/board/logicpd/imx27lite/imx27lite.c
index 6eb5cc2..cc341f8 100644
--- a/board/logicpd/imx27lite/imx27lite.c
+++ b/board/logicpd/imx27lite/imx27lite.c
@@ -38,7 +38,7 @@  int board_init (void)
 	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
 #ifdef CONFIG_MXC_UART
-	mx27_uart_init_pins();
+	mx27_uart1_init_pins();
 #endif
 #ifdef CONFIG_FEC_MXC
 	mx27_fec_init_pins();