ppc4xx: Only define DDR2 registers for the correct PowerPC variants

PATCH New Stefan Roese 1 participant 2 messages Jul 21, 2010 – Jul 23, 2010 PowerPC

lore

Share & tools

lore

Stefan Roese

author

2010-07-21 09:08 UTC #0 lore raw

PATCH 1/2 ppc4xx: Only define DDR2 registers for the correct PowerPC variants

Make sure that some SDRAM/DDR2 registers are only defined for the PPC variants really implementing those registers.

Signed-off-by Stefan Roese <[email protected]>

---
 arch/powerpc/include/asm/ppc4xx-sdram.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

arch/powerpc/include/asm/ppc4xx-sdram.h +4 -4

index d9506e2..42eac45 100644
@@ -363,6 +363,7 @@
 /*
  * Memory controller registers
  */
+#ifdef CONFIG_405EX
 #define SDRAM_BESR	0x00	/* PLB bus error status (read/clear)         */
 #define SDRAM_BESRT	0x01	/* PLB bus error status (test/set)           */
 #define SDRAM_BEARL	0x02	/* PLB bus error address low                 */

@@ -371,11 +372,10 @@
 #define SDRAM_WMIRQT	0x07	/* PLB write master interrupt (test/set)     */
 #define SDRAM_PLBOPT	0x08	/* PLB slave options                         */
 #define SDRAM_PUABA	0x09	/* PLB upper address base                    */
-#ifndef CONFIG_405EX
-#define SDRAM_MCSTAT	0x14	/* memory controller status                  */
-#else
 #define SDRAM_MCSTAT	0x1F	/* memory controller status                  */
-#endif
+#else /* CONFIG_405EX */
+#define SDRAM_MCSTAT	0x14	/* memory controller status                  */
+#endif /* CONFIG_405EX */
 #define SDRAM_MCOPT1	0x20	/* memory controller options 1               */
 #define SDRAM_MCOPT2	0x21	/* memory controller options 2               */
 #define SDRAM_MODT0	0x22	/* on die termination for bank 0             */

Signature · 1 line

1.7.1.1

Stefan Roese

author

2010-07-23 08:17 UTC #1 lore raw

PATCH 1/2 ppc4xx: Only define DDR2 registers for the correct PowerPC variants

Quoted 2 lines · On Wednesday 21 July 2010 11:08:16 Stefan Roese wrote:

Make sure that some SDRAM/DDR2 registers are only defined for the PPC variants really implementing those registers.

Applied to u-boot-ppc4xx/master. Thanks.

Cheers,
Stefan

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de