summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhao Qiang <B45475@freescale.com>2014-03-21 16:21:46 +0800
committerYork Sun <yorksun@freescale.com>2014-04-22 17:58:49 -0700
commit6259e291341d4c3753c7ce0e61d2bf8bdc5eacf0 (patch)
treefaabbc7f87032f6c75e9d13307c02f519120285e
parent5303a3dea95227f940440a7a4101dfbb76959682 (diff)
downloadu-boot-imx-6259e291341d4c3753c7ce0e61d2bf8bdc5eacf0.zip
u-boot-imx-6259e291341d4c3753c7ce0e61d2bf8bdc5eacf0.tar.gz
u-boot-imx-6259e291341d4c3753c7ce0e61d2bf8bdc5eacf0.tar.bz2
T1040QDS/U-QE: Add u-qe support to t1040qds
Add u-qe support for t1040qds Signed-off-by: Zhao Qiang <B45475@freescale.com> Reviewed-by: York Sun <yorksun@freescale.com>
-rw-r--r--board/freescale/t1040qds/t1040qds.c27
-rw-r--r--include/configs/T1040QDS.h3
2 files changed, 30 insertions, 0 deletions
diff --git a/board/freescale/t1040qds/t1040qds.c b/board/freescale/t1040qds/t1040qds.c
index f1d7cde..0e83d17 100644
--- a/board/freescale/t1040qds/t1040qds.c
+++ b/board/freescale/t1040qds/t1040qds.c
@@ -18,6 +18,7 @@
#include <asm/fsl_portals.h>
#include <asm/fsl_liodn.h>
#include <fm_eth.h>
+#include <hwconfig.h>
#include <asm/mpc85xx_gpio.h>
#include "../common/qixis.h"
@@ -90,6 +91,30 @@ int select_i2c_ch_pca9547(u8 ch)
return 0;
}
+static void qe_board_setup(void)
+{
+ u8 brdcfg15, brdcfg9;
+
+ if (hwconfig("qe") && hwconfig("tdm")) {
+ brdcfg15 = QIXIS_READ(brdcfg[15]);
+ /*
+ * TDMRiser uses QE-TDM
+ * Route QE_TDM signals to TDM Riser slot
+ */
+ QIXIS_WRITE(brdcfg[15], brdcfg15 | 7);
+ } else if (hwconfig("qe") && hwconfig("uart")) {
+ brdcfg15 = QIXIS_READ(brdcfg[15]);
+ brdcfg9 = QIXIS_READ(brdcfg[9]);
+ /*
+ * Route QE_TDM signals to UCC
+ * ProfiBus controlled by UCC3
+ */
+ brdcfg15 &= 0xfc;
+ QIXIS_WRITE(brdcfg[15], brdcfg15 | 2);
+ QIXIS_WRITE(brdcfg[9], brdcfg9 | 4);
+ }
+}
+
int board_early_init_r(void)
{
#ifdef CONFIG_SYS_FLASH_BASE
@@ -197,6 +222,8 @@ int misc_init_r(void)
}
}
+ qe_board_setup();
+
return 0;
}
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 745a2f2..6cc4e92 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -601,6 +601,8 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_SYS_DPAA_FMAN
#define CONFIG_SYS_DPAA_PME
+#define CONFIG_QE
+#define CONFIG_U_QE
/* Default address of microcode for the Linux Fman driver */
#if defined(CONFIG_SPIFLASH)
/*
@@ -623,6 +625,7 @@ unsigned long get_board_ddr_clk(void);
#else
#define CONFIG_SYS_QE_FMAN_FW_IN_NOR
#define CONFIG_SYS_FMAN_FW_ADDR 0xEFF00000
+#define CONFIG_SYS_QE_FW_ADDR 0xEFF10000
#endif
#define CONFIG_SYS_QE_FMAN_FW_LENGTH 0x10000
#define CONFIG_SYS_FDT_PAD (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)