Browse Source

mpc512x: make MEM IO Control configuration a board config option

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Anatolij Gustschin 15 years ago
parent
commit
5d937e8b59

+ 1 - 1
arch/powerpc/cpu/mpc512x/fixed_sdram.c

@@ -91,7 +91,7 @@ long int fixed_sdram(ddr512x_config_t *mddrc_config,
 	}
 	}
 
 
 	/* Initialize IO Control */
 	/* Initialize IO Control */
-	out_be32(&im->io_ctrl.io_control_mem, IOCTRL_MUX_DDR);
+	out_be32(&im->io_ctrl.io_control_mem, CONFIG_SYS_IOCTRL_MUX_DDR);
 
 
 	/* Initialize DDR Local Window */
 	/* Initialize DDR Local Window */
 	out_be32(&im->sysconf.ddrlaw.bar, CONFIG_SYS_DDR_BASE & 0xFFFFF000);
 	out_be32(&im->sysconf.ddrlaw.bar, CONFIG_SYS_DDR_BASE & 0xFFFFF000);

+ 0 - 4
arch/powerpc/include/asm/immap_512x.h

@@ -848,10 +848,6 @@ typedef struct ioctrl512x {
 	u8	reserved[0x0cfc];		/* fill to 4096 bytes size */
 	u8	reserved[0x0cfc];		/* fill to 4096 bytes size */
 } ioctrl512x_t;
 } ioctrl512x_t;
 
 
-/* Indexes in regs array */
-/* Set for DDR */
-#define IOCTRL_MUX_DDR		0x00000036
-
 /* IO pin fields */
 /* IO pin fields */
 #define IO_PIN_FMUX(v)	((v) << 7)	/* pin function */
 #define IO_PIN_FMUX(v)	((v) << 7)	/* pin function */
 #define IO_PIN_HOLD(v)	((v) << 5)	/* hold time, pci only */
 #define IO_PIN_HOLD(v)	((v) << 5)	/* hold time, pci only */

+ 2 - 0
include/configs/aria.h

@@ -79,6 +79,8 @@
 #define CONFIG_SYS_DDR_BASE		0x00000000
 #define CONFIG_SYS_DDR_BASE		0x00000000
 #define CONFIG_SYS_SDRAM_BASE		CONFIG_SYS_DDR_BASE
 #define CONFIG_SYS_SDRAM_BASE		CONFIG_SYS_DDR_BASE
 
 
+#define CONFIG_SYS_IOCTRL_MUX_DDR	0x00000036
+
 /* DDR Controller Configuration
 /* DDR Controller Configuration
  *
  *
  * SYS_CFG:
  * SYS_CFG:

+ 2 - 0
include/configs/mecp5123.h

@@ -67,6 +67,8 @@
 #define CONFIG_SYS_DDR_BASE		0x00000000	/* DDR is sys memory*/
 #define CONFIG_SYS_DDR_BASE		0x00000000	/* DDR is sys memory*/
 #define CONFIG_SYS_SDRAM_BASE		CONFIG_SYS_DDR_BASE
 #define CONFIG_SYS_SDRAM_BASE		CONFIG_SYS_DDR_BASE
 
 
+#define CONFIG_SYS_IOCTRL_MUX_DDR	0x00000036
+
 /* DDR Controller Configuration
 /* DDR Controller Configuration
  *
  *
  * SYS_CFG:
  * SYS_CFG:

+ 2 - 0
include/configs/mpc5121ads.h

@@ -86,6 +86,8 @@
 #define CONFIG_SYS_DDR_BASE		0x00000000	/* DDR is system memory*/
 #define CONFIG_SYS_DDR_BASE		0x00000000	/* DDR is system memory*/
 #define CONFIG_SYS_SDRAM_BASE		CONFIG_SYS_DDR_BASE
 #define CONFIG_SYS_SDRAM_BASE		CONFIG_SYS_DDR_BASE
 
 
+#define CONFIG_SYS_IOCTRL_MUX_DDR	0x00000036
+
 /* DDR Controller Configuration
 /* DDR Controller Configuration
  *
  *
  * SYS_CFG:
  * SYS_CFG: