From 0795eff34c5744dcc59ead6edbbcd2cd600f58fe Mon Sep 17 00:00:00 2001 From: Minghuan Lian Date: Wed, 3 Jul 2013 18:32:41 +0800 Subject: powerpc/rman: fix RMan support for t4240 and b4860 1. Add CONFIG_SYS_DPAA_RMAN macro to t4240 and b4860. 2. Decrease RMan liodn offset number. SET_RMAN_LIODN() is used to set liodn offset of RMan blocks 0-3. For t4240 and b4860, RMan liodn base is assigned to 922, the original offset number is too large that the liodn (base+offset 922+678 = 1600) is greater than 0x500 the maximum liodn number. Signed-off-by: Minghuan Lian Signed-off-by: York Sun --- arch/powerpc/cpu/mpc85xx/b4860_ids.c | 8 ++++---- arch/powerpc/cpu/mpc85xx/t4240_ids.c | 8 ++++---- include/configs/B4860QDS.h | 2 ++ include/configs/T4240EMU.h | 1 + include/configs/T4240QDS.h | 1 + 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/b4860_ids.c b/arch/powerpc/cpu/mpc85xx/b4860_ids.c index 1959580..39b8e3e 100644 --- a/arch/powerpc/cpu/mpc85xx/b4860_ids.c +++ b/arch/powerpc/cpu/mpc85xx/b4860_ids.c @@ -112,10 +112,10 @@ int sec_liodn_tbl_sz = ARRAY_SIZE(sec_liodn_tbl); #ifdef CONFIG_SYS_DPAA_RMAN struct liodn_id_table rman_liodn_tbl[] = { /* Set RMan block 0-3 liodn offset */ - SET_RMAN_LIODN(0, 678), - SET_RMAN_LIODN(1, 679), - SET_RMAN_LIODN(2, 680), - SET_RMAN_LIODN(3, 681), + SET_RMAN_LIODN(0, 6), + SET_RMAN_LIODN(1, 7), + SET_RMAN_LIODN(2, 8), + SET_RMAN_LIODN(3, 9), }; int rman_liodn_tbl_sz = ARRAY_SIZE(rman_liodn_tbl); #endif diff --git a/arch/powerpc/cpu/mpc85xx/t4240_ids.c b/arch/powerpc/cpu/mpc85xx/t4240_ids.c index d0bb27d..54c1cfd 100644 --- a/arch/powerpc/cpu/mpc85xx/t4240_ids.c +++ b/arch/powerpc/cpu/mpc85xx/t4240_ids.c @@ -159,10 +159,10 @@ int sec_liodn_tbl_sz = ARRAY_SIZE(sec_liodn_tbl); #ifdef CONFIG_SYS_DPAA_RMAN struct liodn_id_table rman_liodn_tbl[] = { /* Set RMan block 0-3 liodn offset */ - SET_RMAN_LIODN(0, 678), - SET_RMAN_LIODN(1, 679), - SET_RMAN_LIODN(2, 680), - SET_RMAN_LIODN(3, 681), + SET_RMAN_LIODN(0, 6), + SET_RMAN_LIODN(1, 7), + SET_RMAN_LIODN(2, 8), + SET_RMAN_LIODN(3, 9), }; int rman_liodn_tbl_sz = ARRAY_SIZE(rman_liodn_tbl); #endif diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 7bc3428..2f0bc6b 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -584,6 +584,8 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_DPAA_FMAN +#define CONFIG_SYS_DPAA_RMAN + /* Default address of microcode for the Linux Fman driver */ #if defined(CONFIG_SPIFLASH) /* diff --git a/include/configs/T4240EMU.h b/include/configs/T4240EMU.h index 537ff81..033992d 100644 --- a/include/configs/T4240EMU.h +++ b/include/configs/T4240EMU.h @@ -112,6 +112,7 @@ #define CONFIG_SYS_DPAA_PME #define CONFIG_SYS_PMAN #define CONFIG_SYS_DPAA_DCE +#define CONFIG_SYS_DPAA_RMAN #define CONFIG_SYS_INTERLAKEN #define CONFIG_SYS_QE_FMAN_FW_IN_NOR diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index d92de35..92a30ab 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -360,6 +360,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_DPAA_PME #define CONFIG_SYS_PMAN #define CONFIG_SYS_DPAA_DCE +#define CONFIG_SYS_DPAA_RMAN #define CONFIG_SYS_INTERLAKEN /* Default address of microcode for the Linux Fman driver */ -- cgit v1.1