summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-07-02 10:59:30 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-07-02 10:59:30 +0200
commit6e4b15537b522fc6d393d664c12f40b4a00b5ef6 (patch)
treedc6dde42fe31820cd86719ed1d0c3e20983dff6b /arch
parentdd3c898d06a55a4c6fe94dae3f732a541e983432 (diff)
parenta0b061147767c16eb443f510b7424e03d2f07209 (diff)
downloadbarebox-6e4b15537b522fc6d393d664c12f40b4a00b5ef6.tar.gz
barebox-6e4b15537b522fc6d393d664c12f40b4a00b5ef6.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c11
-rw-r--r--arch/arm/boards/freescale-mx51-pdk/board.c13
2 files changed, 14 insertions, 10 deletions
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..3a568d051f 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,
@@ -246,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);
@@ -268,12 +275,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;
}