From 25cbed68428b2cd987f06f3b38d1b7748b98d37d Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Thu, 21 Jun 2012 12:05:02 +0400 Subject: Setup UART-pads via iomux interface Signed-off-by: Alexander Shiyan Signed-off-by: Sascha Hauer --- arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c | 11 ++++++----- arch/arm/boards/freescale-mx51-pdk/board.c | 12 +++++++----- 2 files changed, 13 insertions(+), 10 deletions(-) (limited to 'arch') diff --git a/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c b/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c index 3cc7a72252..35c114dad0 100644 --- a/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c +++ b/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c @@ -53,6 +53,11 @@ struct imx_nand_platform_data nand_info = { }; static iomux_v3_cfg_t eukrea_cpuimx51_pads[] = { + /* UART1 */ + MX51_PAD_UART1_RXD__UART1_RXD, + MX51_PAD_UART1_TXD__UART1_TXD, + MX51_PAD_UART1_RTS__UART1_RTS, + MX51_PAD_UART1_CTS__UART1_CTS, /* FEC */ MX51_PAD_DISP2_DAT1__FEC_RX_ER, MX51_PAD_DISP2_DAT15__FEC_TDATA0, @@ -141,12 +146,8 @@ static int eukrea_cpuimx51_console_init(void) imx51_init_lowlevel(800); - writel(0, 0x73fa8228); - writel(0, 0x73fa822c); - writel(0, 0x73fa8230); - writel(0, 0x73fa8234); - imx51_add_uart0(); + return 0; } diff --git a/arch/arm/boards/freescale-mx51-pdk/board.c b/arch/arm/boards/freescale-mx51-pdk/board.c index 0bb2ffed29..9ec331aed2 100644 --- a/arch/arm/boards/freescale-mx51-pdk/board.c +++ b/arch/arm/boards/freescale-mx51-pdk/board.c @@ -48,6 +48,12 @@ static struct fec_platform_data fec_info = { }; static iomux_v3_cfg_t f3s_pads[] = { + /* UART1 */ + MX51_PAD_UART1_RXD__UART1_RXD, + MX51_PAD_UART1_TXD__UART1_TXD, + MX51_PAD_UART1_RTS__UART1_RTS, + MX51_PAD_UART1_CTS__UART1_CTS, + /* FEC */ MX51_PAD_EIM_EB2__FEC_MDIO, MX51_PAD_EIM_EB3__FEC_RDATA1, MX51_PAD_EIM_CS2__FEC_RDATA2, @@ -268,12 +274,8 @@ static int f3s_console_init(void) { mxc_iomux_v3_setup_multiple_pads(f3s_pads, ARRAY_SIZE(f3s_pads)); - writel(0, 0x73fa8228); - writel(0, 0x73fa822c); - writel(0, 0x73fa8230); - writel(0, 0x73fa8234); - imx51_add_uart0(); + return 0; } -- cgit v1.2.3 From 2fa9e369ebfc349422b813c721245604db61480a Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 19 Oct 2011 09:28:51 +0200 Subject: ARM i.MX51 babbage: add mci1 The iomuxer is already initialized, only need to add the device. Signed-off-by: Sascha Hauer --- arch/arm/boards/freescale-mx51-pdk/board.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch') diff --git a/arch/arm/boards/freescale-mx51-pdk/board.c b/arch/arm/boards/freescale-mx51-pdk/board.c index 9ec331aed2..3a568d051f 100644 --- a/arch/arm/boards/freescale-mx51-pdk/board.c +++ b/arch/arm/boards/freescale-mx51-pdk/board.c @@ -252,6 +252,7 @@ static int f3s_devices_init(void) imx51_iim_register_fec_ethaddr(); imx51_add_fec(&fec_info); imx51_add_mmc0(NULL); + imx51_add_mmc1(NULL); armlinux_set_bootparams((void *)0x90000100); armlinux_set_architecture(MACH_TYPE_MX51_BABBAGE); -- cgit v1.2.3