summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiu Gang <Gang.Liu@freescale.com>2013-06-25 18:12:13 +0800
committerYork Sun <yorksun@freescale.com>2013-08-09 12:41:37 -0700
commit32f38ee3ed63075c689af822f38a3822eae3b463 (patch)
treea9b1d2eff9803bb0d450275893ab8a2b14951aa9
parentb3831020402adc81930c52cb8e52c7ff868d2fc7 (diff)
downloadu-boot-imx-32f38ee3ed63075c689af822f38a3822eae3b463.zip
u-boot-imx-32f38ee3ed63075c689af822f38a3822eae3b463.tar.gz
u-boot-imx-32f38ee3ed63075c689af822f38a3822eae3b463.tar.bz2
powerpc/b4860: Correct LIODN assignment for SRIO
For B4, the SRIO LIODN registers are in SRIO address space and not in GUTs. Signed-off-by: Liu Gang <Gang.Liu@freescale.com>
-rw-r--r--arch/powerpc/cpu/mpc85xx/b4860_ids.c4
-rw-r--r--arch/powerpc/include/asm/config_mpc85xx.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/b4860_ids.c b/arch/powerpc/cpu/mpc85xx/b4860_ids.c
index 53c6a7f..1959580 100644
--- a/arch/powerpc/cpu/mpc85xx/b4860_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/b4860_ids.c
@@ -41,8 +41,8 @@ struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
#ifdef CONFIG_SYS_SRIO
struct srio_liodn_id_table srio_liodn_tbl[] = {
- SET_SRIO_LIODN_1(1, 307),
- SET_SRIO_LIODN_1(2, 387),
+ SET_SRIO_LIODN_BASE(1, 307),
+ SET_SRIO_LIODN_BASE(2, 387),
};
int srio_liodn_tbl_sz = ARRAY_SIZE(srio_liodn_tbl);
#endif
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 7ed93ac..6d7b3b3 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -576,6 +576,7 @@
#define CONFIG_SYS_FSL_SRIO_MAX_PORTS 2
#define CONFIG_SYS_FSL_SRIO_OB_WIN_NUM 9
#define CONFIG_SYS_FSL_SRIO_IB_WIN_NUM 5
+#define CONFIG_SYS_FSL_SRIO_LIODN
#else
#define CONFIG_MAX_CPUS 2
#define CONFIG_SYS_FSL_CORES_PER_CLUSTER 2