Add LSDMR (SDRAM Mode Register) definition on localbus
PATCH 1/3 Add LSDMR (SDRAM Mode Register) definition on localbus
The masks for various bit defines of LSDMR are common and thus we can define them in one place rather than replicating them in each config.h
Signed-off-by Kumar Gala <[email protected]>
--- include/asm-ppc/fsl_lbc.h | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-)
include/asm-ppc/fsl_lbc.h +27 -0
@@ -397,6 +397,33 @@#define FPAR_LP_CI 0x000007FF#define FPAR_LP_CI_SHIFT 0 +/* LSDMR - SDRAM Machine Mode Register +*/ +#define LSDMR_RFEN (1 << (31 - 1)) +#define LSDMR_BSMA1516 (3 << (31 - 10)) +#define LSDMR_BSMA1617 (4 << (31 - 10)) +#define LSDMR_RFCR5 (3 << (31 - 16)) +#define LSDMR_RFCR16 (7 << (31 - 16)) +#define LSDMR_PRETOACT3 (3 << (31 - 19)) +#define LSDMR_PRETOACT7 (7 << (31 - 19)) +#define LSDMR_ACTTORW3 (3 << (31 - 22)) +#define LSDMR_ACTTORW7 (7 << (31 - 22)) +#define LSDMR_ACTTORW6 (6 << (31 - 22)) +#define LSDMR_BL8 (1 << (31 - 23)) +#define LSDMR_WRC2 (2 << (31 - 27)) +#define LSDMR_WRC4 (0 << (31 - 27)) +#define LSDMR_BUFCMD (1 << (31 - 29)) +#define LSDMR_CL3 (3 << (31 - 31)) + +#define LSDMR_OP_NORMAL (0 << (31 - 4)) +#define LSDMR_OP_ARFRSH (1 << (31 - 4)) +#define LSDMR_OP_SRFRSH (2 << (31 - 4)) +#define LSDMR_OP_MRW (3 << (31 - 4)) +#define LSDMR_OP_PRECH (4 << (31 - 4)) +#define LSDMR_OP_PCHALL (5 << (31 - 4)) +#define LSDMR_OP_ACTBNK (6 << (31 - 4)) +#define LSDMR_OP_RWINV (7 << (31 - 4)) +/* LTESR - Transfer Error Status Register */ #define LTESR_BM 0x80000000
Signature · 1 line
1.5.6.6
PATCH 2/3 85xx: Use common LSDMR defines from asm/fsl_lbc.h
Signed-off-by Kumar Gala <[email protected]>
--- board/freescale/mpc8541cds/mpc8541cds.c | 14 ++++---- board/freescale/mpc8548cds/mpc8548cds.c | 10 +++--- board/freescale/mpc8555cds/mpc8555cds.c | 14 ++++---- board/freescale/mpc8560ads/mpc8560ads.c | 1 + board/freescale/mpc8568mds/mpc8568mds.c | 10 +++--- board/sbc8548/sbc8548.c | 10 +++--- include/configs/MPC8540ADS.h | 59 +++++++------------------------ include/configs/MPC8541CDS.h | 37 ++++---------------- include/configs/MPC8548CDS.h | 37 ++++---------------- include/configs/MPC8555CDS.h | 37 ++++---------------- include/configs/MPC8560ADS.h | 59 +++++++------------------------ include/configs/MPC8568MDS.h | 37 ++++---------------- include/configs/sbc8548.h | 37 ++++---------------- 13 files changed, 91 insertions(+), 271 deletions(-)
board/freescale/mpc8541cds/mpc8541cds.c +7 -7
@@ -372,21 +372,21 @@ sdram_init(void) cpu_board_rev =get_cpu_board_revision (); lsdmr_common =CONFIG_SYS_LBC_LSDMR_COMMON ;if (cpu_board_rev ==MPC85XX_CPU_BOARD_REV_1_0 ) { - lsdmr_common |=CONFIG_SYS_LBC_LSDMR_BSMA1617 ; + lsdmr_common |=LSDMR_BSMA1617 ; }else if (cpu_board_rev ==MPC85XX_CPU_BOARD_REV_1_1 ) { - lsdmr_common |=CONFIG_SYS_LBC_LSDMR_BSMA1516 ; + lsdmr_common |=LSDMR_BSMA1516 ; }else {/* * Assume something unable to identify itself is * really old, and likely has lines 16/17 mapped. */ - lsdmr_common |=CONFIG_SYS_LBC_LSDMR_BSMA1617 ; + lsdmr_common |=LSDMR_BSMA1617 ; }/* * Issue PRECHARGE ALL command. */ - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_PCHALL ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_PCHALL ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
@@ -396,7 +396,7 @@ sdram_init(void)* Issue 8 AUTO REFRESH commands. */ for (idx =0 ; idx <8 ; idx++) { - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_ARFRSH ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_ARFRSH ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
@@ -406,7 +406,7 @@ sdram_init(void)/* * Issue 8 MODE-set command. */ - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_MRW ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_MRW ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
@@ -415,7 +415,7 @@ sdram_init(void)/* * Issue NORMAL OP command. */ - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_NORMAL ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_NORMAL ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
board/freescale/mpc8548cds/mpc8548cds.c +5 -5
@@ -185,12 +185,12 @@ sdram_init(void)*/ cpu_board_rev =get_cpu_board_revision (); lsdmr_common =CONFIG_SYS_LBC_LSDMR_COMMON ; - lsdmr_common |=CONFIG_SYS_LBC_LSDMR_BSMA1516 ; + lsdmr_common |=LSDMR_BSMA1516 ;/* * Issue PRECHARGE ALL command. */ - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_PCHALL ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_PCHALL ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
@@ -200,7 +200,7 @@ sdram_init(void)* Issue 8 AUTO REFRESH commands. */ for (idx =0 ; idx <8 ; idx++) { - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_ARFRSH ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_ARFRSH ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
@@ -210,7 +210,7 @@ sdram_init(void)/* * Issue 8 MODE-set command. */ - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_MRW ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_MRW ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
@@ -219,7 +219,7 @@ sdram_init(void)/* * Issue NORMAL OP command. */ - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_NORMAL ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_NORMAL ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
board/freescale/mpc8555cds/mpc8555cds.c +7 -7
@@ -371,21 +371,21 @@ sdram_init(void) cpu_board_rev =get_cpu_board_revision (); lsdmr_common =CONFIG_SYS_LBC_LSDMR_COMMON ;if (cpu_board_rev ==MPC85XX_CPU_BOARD_REV_1_0 ) { - lsdmr_common |=CONFIG_SYS_LBC_LSDMR_BSMA1617 ; + lsdmr_common |=LSDMR_BSMA1617 ; }else if (cpu_board_rev ==MPC85XX_CPU_BOARD_REV_1_1 ) { - lsdmr_common |=CONFIG_SYS_LBC_LSDMR_BSMA1516 ; + lsdmr_common |=LSDMR_BSMA1516 ; }else {/* * Assume something unable to identify itself is * really old, and likely has lines 16/17 mapped. */ - lsdmr_common |=CONFIG_SYS_LBC_LSDMR_BSMA1617 ; + lsdmr_common |=LSDMR_BSMA1617 ; }/* * Issue PRECHARGE ALL command. */ - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_PCHALL ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_PCHALL ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
@@ -395,7 +395,7 @@ sdram_init(void)* Issue 8 AUTO REFRESH commands. */ for (idx =0 ; idx <8 ; idx++) { - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_ARFRSH ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_ARFRSH ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
@@ -405,7 +405,7 @@ sdram_init(void)/* * Issue 8 MODE-set command. */ - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_MRW ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_MRW ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
@@ -414,7 +414,7 @@ sdram_init(void)/* * Issue NORMAL OP command. */ - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_NORMAL ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_NORMAL ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
board/freescale/mpc8560ads/mpc8560ads.c +1 -0
@@ -36,6 +36,7 @@#include <miiphy.h> #include <libfdt.h> #include <fdt_support.h> +#include <asm/fsl_lbc.h> #if defined(CONFIG_DDR_ECC ) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER )extern void ddr_enable_ecc (unsigned int dram_size);
board/freescale/mpc8568mds/mpc8568mds.c +5 -5
@@ -243,12 +243,12 @@ sdram_init(void)* MPC8568 uses "new" 15-16 style addressing. */ lsdmr_common =CONFIG_SYS_LBC_LSDMR_COMMON ; - lsdmr_common |=CONFIG_SYS_LBC_LSDMR_BSMA1516 ; + lsdmr_common |=LSDMR_BSMA1516 ;/* * Issue PRECHARGE ALL command. */ - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_PCHALL ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_PCHALL ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
@@ -258,7 +258,7 @@ sdram_init(void)* Issue 8 AUTO REFRESH commands. */ for (idx =0 ; idx <8 ; idx++) { - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_ARFRSH ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_ARFRSH ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
@@ -268,7 +268,7 @@ sdram_init(void)/* * Issue 8 MODE-set command. */ - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_MRW ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_MRW ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
@@ -277,7 +277,7 @@ sdram_init(void)/* * Issue NORMAL OP command. */ - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_NORMAL ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_NORMAL ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
board/sbc8548/sbc8548.c +5 -5
@@ -184,12 +184,12 @@ sdram_init(void)* MPC8548 uses "new" 15-16 style addressing. */ lsdmr_common =CONFIG_SYS_LBC_LSDMR_COMMON ; - lsdmr_common |=CONFIG_SYS_LBC_LSDMR_BSMA1516 ; + lsdmr_common |=LSDMR_BSMA1516 ;/* * Issue PRECHARGE ALL command. */ - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_PCHALL ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_PCHALL ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
@@ -199,7 +199,7 @@ sdram_init(void)* Issue 8 AUTO REFRESH commands. */ for (idx =0 ; idx <8 ; idx++) { - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_ARFRSH ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_ARFRSH ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
@@ -209,7 +209,7 @@ sdram_init(void)/* * Issue 8 MODE-set command. */ - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_MRW ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_MRW ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
@@ -218,7 +218,7 @@ sdram_init(void)/* * Issue NORMAL OP command. */ - lbc->lsdmr = lsdmr_common |CONFIG_SYS_LBC_LSDMR_OP_NORMAL ; + lbc->lsdmr = lsdmr_common |LSDMR_OP_NORMAL ; asm("sync;msync" ); *sdram_addr =0xff ;ppcDcbf ((unsigned long ) sdram_addr);
include/configs/MPC8540ADS.h +13 -46
70 lines not on this page · raw message
include/configs/MPC8541CDS.h +7 -30
@@ -207,41 +207,18 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_LBC_MRTPR 0x00000000/* LB refresh timer prescal*/ /* -* LSDMR masks -*/ -#define CONFIG_SYS_LBC_LSDMR_RFEN (1 << (31 - 1)) -#define CONFIG_SYS_LBC_LSDMR_BSMA1516 (3 << (31 - 10)) -#define CONFIG_SYS_LBC_LSDMR_BSMA1617 (4 << (31 - 10)) -#define CONFIG_SYS_LBC_LSDMR_RFCR16 (7 << (31 - 16)) -#define CONFIG_SYS_LBC_LSDMR_PRETOACT7 (7 << (31 - 19)) -#define CONFIG_SYS_LBC_LSDMR_ACTTORW7 (7 << (31 - 22)) -#define CONFIG_SYS_LBC_LSDMR_ACTTORW6 (6 << (31 - 22)) -#define CONFIG_SYS_LBC_LSDMR_BL8 (1 << (31 - 23)) -#define CONFIG_SYS_LBC_LSDMR_WRC4 (0 << (31 - 27)) -#define CONFIG_SYS_LBC_LSDMR_CL3 (3 << (31 - 31)) - -#define CONFIG_SYS_LBC_LSDMR_OP_NORMAL (0 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_ARFRSH (1 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_SRFRSH (2 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_MRW (3 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_PRECH (4 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_PCHALL (5 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_ACTBNK (6 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_RWINV (7 << (31 - 4)) - -/* * Common settings for all Local Bus SDRAM commands. * At run time, either BSMA1516 (for CPU 1.1) * or BSMA1617 (for CPU 1.0) (old) * is OR'ed in too. */ -#define CONFIG_SYS_LBC_LSDMR_COMMON ( CONFIG_SYS_LBC_LSDMR_RFCR16 \ - | CONFIG_SYS_LBC_LSDMR_PRETOACT7 \ - | CONFIG_SYS_LBC_LSDMR_ACTTORW7 \ - | CONFIG_SYS_LBC_LSDMR_BL8 \ - | CONFIG_SYS_LBC_LSDMR_WRC4 \ - | CONFIG_SYS_LBC_LSDMR_CL3 \ - | CONFIG_SYS_LBC_LSDMR_RFEN \ +#define CONFIG_SYS_LBC_LSDMR_COMMON ( LSDMR_RFCR16 \ + | LSDMR_PRETOACT7 \ + | LSDMR_ACTTORW7 \ + | LSDMR_BL8 \ + | LSDMR_WRC4 \ + | LSDMR_CL3 \ + | LSDMR_RFEN \ )/*
include/configs/MPC8548CDS.h +7 -30
@@ -229,41 +229,18 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_LBC_MRTPR 0x00000000/* LB refresh timer prescal*/ /* -* LSDMR masks -*/ -#define CONFIG_SYS_LBC_LSDMR_RFEN (1 << (31 - 1)) -#define CONFIG_SYS_LBC_LSDMR_BSMA1516 (3 << (31 - 10)) -#define CONFIG_SYS_LBC_LSDMR_BSMA1617 (4 << (31 - 10)) -#define CONFIG_SYS_LBC_LSDMR_RFCR16 (7 << (31 - 16)) -#define CONFIG_SYS_LBC_LSDMR_PRETOACT7 (7 << (31 - 19)) -#define CONFIG_SYS_LBC_LSDMR_ACTTORW7 (7 << (31 - 22)) -#define CONFIG_SYS_LBC_LSDMR_ACTTORW6 (6 << (31 - 22)) -#define CONFIG_SYS_LBC_LSDMR_BL8 (1 << (31 - 23)) -#define CONFIG_SYS_LBC_LSDMR_WRC4 (0 << (31 - 27)) -#define CONFIG_SYS_LBC_LSDMR_CL3 (3 << (31 - 31)) - -#define CONFIG_SYS_LBC_LSDMR_OP_NORMAL (0 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_ARFRSH (1 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_SRFRSH (2 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_MRW (3 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_PRECH (4 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_PCHALL (5 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_ACTBNK (6 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_RWINV (7 << (31 - 4)) - -/* * Common settings for all Local Bus SDRAM commands. * At run time, either BSMA1516 (for CPU 1.1) * or BSMA1617 (for CPU 1.0) (old) * is OR'ed in too. */ -#define CONFIG_SYS_LBC_LSDMR_COMMON ( CONFIG_SYS_LBC_LSDMR_RFCR16 \ - | CONFIG_SYS_LBC_LSDMR_PRETOACT7 \ - | CONFIG_SYS_LBC_LSDMR_ACTTORW7 \ - | CONFIG_SYS_LBC_LSDMR_BL8 \ - | CONFIG_SYS_LBC_LSDMR_WRC4 \ - | CONFIG_SYS_LBC_LSDMR_CL3 \ - | CONFIG_SYS_LBC_LSDMR_RFEN \ +#define CONFIG_SYS_LBC_LSDMR_COMMON ( LSDMR_RFCR16 \ + | LSDMR_PRETOACT7 \ + | LSDMR_ACTTORW7 \ + | LSDMR_BL8 \ + | LSDMR_WRC4 \ + | LSDMR_CL3 \ + | LSDMR_RFEN \ )/*
include/configs/MPC8555CDS.h +7 -30
@@ -205,41 +205,18 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_LBC_MRTPR 0x00000000/* LB refresh timer prescal*/ /* -* LSDMR masks -*/ -#define CONFIG_SYS_LBC_LSDMR_RFEN (1 << (31 - 1)) -#define CONFIG_SYS_LBC_LSDMR_BSMA1516 (3 << (31 - 10)) -#define CONFIG_SYS_LBC_LSDMR_BSMA1617 (4 << (31 - 10)) -#define CONFIG_SYS_LBC_LSDMR_RFCR16 (7 << (31 - 16)) -#define CONFIG_SYS_LBC_LSDMR_PRETOACT7 (7 << (31 - 19)) -#define CONFIG_SYS_LBC_LSDMR_ACTTORW7 (7 << (31 - 22)) -#define CONFIG_SYS_LBC_LSDMR_ACTTORW6 (6 << (31 - 22)) -#define CONFIG_SYS_LBC_LSDMR_BL8 (1 << (31 - 23)) -#define CONFIG_SYS_LBC_LSDMR_WRC4 (0 << (31 - 27)) -#define CONFIG_SYS_LBC_LSDMR_CL3 (3 << (31 - 31)) - -#define CONFIG_SYS_LBC_LSDMR_OP_NORMAL (0 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_ARFRSH (1 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_SRFRSH (2 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_MRW (3 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_PRECH (4 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_PCHALL (5 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_ACTBNK (6 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_RWINV (7 << (31 - 4)) - -/* * Common settings for all Local Bus SDRAM commands. * At run time, either BSMA1516 (for CPU 1.1) * or BSMA1617 (for CPU 1.0) (old) * is OR'ed in too. */ -#define CONFIG_SYS_LBC_LSDMR_COMMON ( CONFIG_SYS_LBC_LSDMR_RFCR16 \ - | CONFIG_SYS_LBC_LSDMR_PRETOACT7 \ - | CONFIG_SYS_LBC_LSDMR_ACTTORW7 \ - | CONFIG_SYS_LBC_LSDMR_BL8 \ - | CONFIG_SYS_LBC_LSDMR_WRC4 \ - | CONFIG_SYS_LBC_LSDMR_CL3 \ - | CONFIG_SYS_LBC_LSDMR_RFEN \ +#define CONFIG_SYS_LBC_LSDMR_COMMON ( LSDMR_RFCR16 \ + | LSDMR_PRETOACT7 \ + | LSDMR_ACTTORW7 \ + | LSDMR_BL8 \ + | LSDMR_WRC4 \ + | LSDMR_CL3 \ + | LSDMR_RFEN \ )/*
include/configs/MPC8560ADS.h +13 -46
70 lines not on this page · raw message
include/configs/MPC8568MDS.h +7 -30
@@ -188,41 +188,18 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_LBC_MRTPR 0x00000000/* LB refresh timer prescal*/ /* -* LSDMR masks -*/ -#define CONFIG_SYS_LBC_LSDMR_RFEN (1 << (31 - 1)) -#define CONFIG_SYS_LBC_LSDMR_BSMA1516 (3 << (31 - 10)) -#define CONFIG_SYS_LBC_LSDMR_BSMA1617 (4 << (31 - 10)) -#define CONFIG_SYS_LBC_LSDMR_RFCR16 (7 << (31 - 16)) -#define CONFIG_SYS_LBC_LSDMR_PRETOACT7 (7 << (31 - 19)) -#define CONFIG_SYS_LBC_LSDMR_ACTTORW7 (7 << (31 - 22)) -#define CONFIG_SYS_LBC_LSDMR_ACTTORW6 (6 << (31 - 22)) -#define CONFIG_SYS_LBC_LSDMR_BL8 (1 << (31 - 23)) -#define CONFIG_SYS_LBC_LSDMR_WRC4 (0 << (31 - 27)) -#define CONFIG_SYS_LBC_LSDMR_CL3 (3 << (31 - 31)) - -#define CONFIG_SYS_LBC_LSDMR_OP_NORMAL (0 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_ARFRSH (1 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_SRFRSH (2 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_MRW (3 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_PRECH (4 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_PCHALL (5 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_ACTBNK (6 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_RWINV (7 << (31 - 4)) - -/* * Common settings for all Local Bus SDRAM commands. * At run time, either BSMA1516 (for CPU 1.1) * or BSMA1617 (for CPU 1.0) (old) * is OR'ed in too. */ -#define CONFIG_SYS_LBC_LSDMR_COMMON ( CONFIG_SYS_LBC_LSDMR_RFCR16 \ - | CONFIG_SYS_LBC_LSDMR_PRETOACT7 \ - | CONFIG_SYS_LBC_LSDMR_ACTTORW7 \ - | CONFIG_SYS_LBC_LSDMR_BL8 \ - | CONFIG_SYS_LBC_LSDMR_WRC4 \ - | CONFIG_SYS_LBC_LSDMR_CL3 \ - | CONFIG_SYS_LBC_LSDMR_RFEN \ +#define CONFIG_SYS_LBC_LSDMR_COMMON ( LSDMR_RFCR16 \ + | LSDMR_PRETOACT7 \ + | LSDMR_ACTTORW7 \ + | LSDMR_BL8 \ + | LSDMR_WRC4 \ + | LSDMR_CL3 \ + | LSDMR_RFEN \ )/*
include/configs/sbc8548.h +7 -30
@@ -242,41 +242,18 @@#define CONFIG_SYS_LBC_MRTPR 0x00000000/* LB refresh timer prescal*/ /* -* LSDMR masks -*/ -#define CONFIG_SYS_LBC_LSDMR_RFEN (1 << (31 - 1)) -#define CONFIG_SYS_LBC_LSDMR_BSMA1516 (3 << (31 - 10)) -#define CONFIG_SYS_LBC_LSDMR_BSMA1617 (4 << (31 - 10)) -#define CONFIG_SYS_LBC_LSDMR_RFCR16 (7 << (31 - 16)) -#define CONFIG_SYS_LBC_LSDMR_PRETOACT7 (7 << (31 - 19)) -#define CONFIG_SYS_LBC_LSDMR_ACTTORW7 (7 << (31 - 22)) -#define CONFIG_SYS_LBC_LSDMR_ACTTORW6 (6 << (31 - 22)) -#define CONFIG_SYS_LBC_LSDMR_BL8 (1 << (31 - 23)) -#define CONFIG_SYS_LBC_LSDMR_WRC4 (0 << (31 - 27)) -#define CONFIG_SYS_LBC_LSDMR_CL3 (3 << (31 - 31)) - -#define CONFIG_SYS_LBC_LSDMR_OP_NORMAL (0 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_ARFRSH (1 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_SRFRSH (2 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_MRW (3 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_PRECH (4 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_PCHALL (5 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_ACTBNK (6 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_RWINV (7 << (31 - 4)) - -/* * Common settings for all Local Bus SDRAM commands. * At run time, either BSMA1516 (for CPU 1.1) * or BSMA1617 (for CPU 1.0) (old) * is OR'ed in too. */ -#define CONFIG_SYS_LBC_LSDMR_COMMON ( CONFIG_SYS_LBC_LSDMR_RFCR16 \ - | CONFIG_SYS_LBC_LSDMR_PRETOACT7 \ - | CONFIG_SYS_LBC_LSDMR_ACTTORW7 \ - | CONFIG_SYS_LBC_LSDMR_BL8 \ - | CONFIG_SYS_LBC_LSDMR_WRC4 \ - | CONFIG_SYS_LBC_LSDMR_CL3 \ - | CONFIG_SYS_LBC_LSDMR_RFEN \ +#define CONFIG_SYS_LBC_LSDMR_COMMON ( LSDMR_RFCR16 \ + | LSDMR_PRETOACT7 \ + | LSDMR_ACTTORW7 \ + | LSDMR_BL8 \ + | LSDMR_WRC4 \ + | LSDMR_CL3 \ + | LSDMR_RFEN \ )#define CONFIG_SYS_INIT_RAM_LOCK 1
Signature · 1 line
1.5.6.6
PATCH 3/3 83xx: Use common LSDMR defines from asm/fsl_lbc.h
Signed-off-by Kumar Gala <[email protected]>
--- include/configs/MPC8323ERDB.h | 26 ----------------- include/configs/MPC832XEMDS.h | 26 ----------------- include/configs/MPC8349EMDS.h | 62 ++++++++-------------------------------- include/configs/MPC8360EMDS.h | 27 +++-------------- include/configs/sbc8349.h | 62 ++++++++-------------------------------- 5 files changed, 31 insertions(+), 172 deletions(-)
include/configs/MPC8323ERDB.h +0 -26
@@ -248,34 +248,8 @@#define CONFIG_SYS_LBC_LSRT 0x32000000/* LB sdram refresh timer, about 6us */ #define CONFIG_SYS_LBC_MRTPR 0x20000000/* LB refresh timer prescal, 266MHz/32 */ -/* -* LSDMR masks -*/ -#define CONFIG_SYS_LBC_LSDMR_OP_NORMAL (0 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_ARFRSH (1 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_SRFRSH (2 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_MRW (3 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_PRECH (4 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_PCHALL (5 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_ACTBNK (6 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_RWINV (7 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_COMMON 0x0063b723 -/* -* SDRAM Controller configuration sequence. -*/ -#define CONFIG_SYS_LBC_LSDMR_1 ( CONFIG_SYS_LBC_LSDMR_COMMON \ - | CONFIG_SYS_LBC_LSDMR_OP_PCHALL) -#define CONFIG_SYS_LBC_LSDMR_2 ( CONFIG_SYS_LBC_LSDMR_COMMON \ - | CONFIG_SYS_LBC_LSDMR_OP_ARFRSH) -#define CONFIG_SYS_LBC_LSDMR_3 ( CONFIG_SYS_LBC_LSDMR_COMMON \ - | CONFIG_SYS_LBC_LSDMR_OP_ARFRSH) -#define CONFIG_SYS_LBC_LSDMR_4 ( CONFIG_SYS_LBC_LSDMR_COMMON \ - | CONFIG_SYS_LBC_LSDMR_OP_MRW) -#define CONFIG_SYS_LBC_LSDMR_5 ( CONFIG_SYS_LBC_LSDMR_COMMON \ - | CONFIG_SYS_LBC_LSDMR_OP_NORMAL) -#endif /*
include/configs/MPC832XEMDS.h +0 -26
@@ -246,34 +246,8 @@#define CONFIG_SYS_LBC_LSRT 0x32000000/* LB sdram refresh timer, about 6us */ #define CONFIG_SYS_LBC_MRTPR 0x20000000/* LB refresh timer prescal, 266MHz/32 */ -/* -* LSDMR masks -*/ -#define CONFIG_SYS_LBC_LSDMR_OP_NORMAL (0 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_ARFRSH (1 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_SRFRSH (2 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_MRW (3 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_PRECH (4 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_PCHALL (5 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_ACTBNK (6 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_RWINV (7 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_COMMON 0x0063b723 -/* -* SDRAM Controller configuration sequence. -*/ -#define CONFIG_SYS_LBC_LSDMR_1 ( CONFIG_SYS_LBC_LSDMR_COMMON \ - | CONFIG_SYS_LBC_LSDMR_OP_PCHALL) -#define CONFIG_SYS_LBC_LSDMR_2 ( CONFIG_SYS_LBC_LSDMR_COMMON \ - | CONFIG_SYS_LBC_LSDMR_OP_ARFRSH) -#define CONFIG_SYS_LBC_LSDMR_3 ( CONFIG_SYS_LBC_LSDMR_COMMON \ - | CONFIG_SYS_LBC_LSDMR_OP_ARFRSH) -#define CONFIG_SYS_LBC_LSDMR_4 ( CONFIG_SYS_LBC_LSDMR_COMMON \ - | CONFIG_SYS_LBC_LSDMR_OP_MRW) -#define CONFIG_SYS_LBC_LSDMR_5 ( CONFIG_SYS_LBC_LSDMR_COMMON \ - | CONFIG_SYS_LBC_LSDMR_OP_NORMAL) -#endif /*
include/configs/MPC8349EMDS.h +13 -49
73 lines not on this page · raw message
include/configs/MPC8360EMDS.h +5 -22
@@ -271,33 +271,16 @@#define CONFIG_SYS_LBC_LSRT 0x32000000/* LB sdram refresh timer, about 6us */ #define CONFIG_SYS_LBC_MRTPR 0x20000000/* LB refresh timer prescal, 266MHz/32 */ -/* -* LSDMR masks -*/ -#define CONFIG_SYS_LBC_LSDMR_OP_NORMAL (0 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_ARFRSH (1 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_SRFRSH (2 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_MRW (3 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_PRECH (4 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_PCHALL (5 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_ACTBNK (6 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_OP_RWINV (7 << (31 - 4)) -#define CONFIG_SYS_LBC_LSDMR_COMMON 0x0063b723/* * SDRAM Controller configuration sequence. */ -#define CONFIG_SYS_LBC_LSDMR_1 ( CONFIG_SYS_LBC_LSDMR_COMMON \ - | CONFIG_SYS_LBC_LSDMR_OP_PCHALL) -#define CONFIG_SYS_LBC_LSDMR_2 ( CONFIG_SYS_LBC_LSDMR_COMMON \ - | CONFIG_SYS_LBC_LSDMR_OP_ARFRSH) -#define CONFIG_SYS_LBC_LSDMR_3 ( CONFIG_SYS_LBC_LSDMR_COMMON \ - | CONFIG_SYS_LBC_LSDMR_OP_ARFRSH) -#define CONFIG_SYS_LBC_LSDMR_4 ( CONFIG_SYS_LBC_LSDMR_COMMON \ - | CONFIG_SYS_LBC_LSDMR_OP_MRW) -#define CONFIG_SYS_LBC_LSDMR_5 ( CONFIG_SYS_LBC_LSDMR_COMMON \ - | CONFIG_SYS_LBC_LSDMR_OP_NORMAL) +#define CONFIG_SYS_LBC_LSDMR_1 (CONFIG_SYS_LBC_LSDMR_COMMON | LSDMR_OP_PCHALL) +#define CONFIG_SYS_LBC_LSDMR_2 (CONFIG_SYS_LBC_LSDMR_COMMON | LSDMR_OP_ARFRSH) +#define CONFIG_SYS_LBC_LSDMR_3 (CONFIG_SYS_LBC_LSDMR_COMMON | LSDMR_OP_ARFRSH) +#define CONFIG_SYS_LBC_LSDMR_4 (CONFIG_SYS_LBC_LSDMR_COMMON | LSDMR_OP_MRW) +#define CONFIG_SYS_LBC_LSDMR_5 (CONFIG_SYS_LBC_LSDMR_COMMON | LSDMR_OP_NORMAL)#endif
include/configs/sbc8349.h +13 -49
73 lines not on this page · raw message
Signature · 1 line
1.5.6.6
PATCH 3/3 83xx: Use common LSDMR defines from asm/fsl_lbc.h
Quoted 8 lines · On Thu, 26 Mar 2009 01:34:39 -0500 Kumar Gala <[email protected]> wrote:
Signed-off-by Kumar Gala <[email protected]>--- include/configs/MPC8323ERDB.h | 26 ----------------- include/configs/MPC832XEMDS.h | 26 ----------------- include/configs/MPC8349EMDS.h | 62 ++++++++-------------------------------- include/configs/MPC8360EMDS.h | 27 +++-------------- include/configs/sbc8349.h | 62 ++++++++-------------------------------- 5 files changed, 31 insertions(+), 172 deletions(-)
ack.
to go through Andy, I presume.
Thanks,
Kim