Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / arch / powerpc / include / asm / immap_512x.h

diff --git a/arch/powerpc/include/asm/immap_512x.h b/arch/powerpc/include/asm/immap_512x.h
index 01c9efff9779850e2e24a991aeeb29bbcadc6f23..6086a73ba95598cc3b35f2ecf00aa60c7268160d 100644 (file)
--- a/arch/powerpc/include/asm/immap_512x.h
+++ b/arch/powerpc/include/asm/immap_512x.h
@@ -59,7 +59,6 @@ typedef struct sysconf512x {
        u8 res2[0x28];
        law512x_t ddrlaw;       /* DDR Local Access Window */
        u8 res3[0x18];
-       u32 mbxbar;             /* MBX Base Address */
        u32 srambar;            /* SRAM Base Address */
        u32 nfcbar;             /* NFC Base Address */
        u8 res4[0x34];
@@ -279,8 +278,8 @@ typedef struct ddr512x {
        u32 self_refresh_cmd_5; /* Enter/Exit Self Refresh Registers */
        u32 self_refresh_cmd_6; /* Enter/Exit Self Refresh Registers */
        u32 self_refresh_cmd_7; /* Enter/Exit Self Refresh Registers */
-       u32 DQS_config_offset_count;    /* DQS Config Offset Count */
-       u32 DQS_config_offset_time;     /* DQS Config Offset Time */
+       u32 dqs_config_offset_count;    /* DQS Config Offset Count */
+       u32 dqs_config_offset_time;     /* DQS Config Offset Time */
        u32 DQS_delay_status;   /* DQS Delay Status */
        u32 res0[0xF];
        u32 prioman_config1;    /* Priority Manager Configuration */
@@ -1255,9 +1254,9 @@ static inline u32 get_pata_base (void)
 }
 #endif /* __ASSEMBLY__ */
 
-#define CONFIG_SYS_MPC512x_USB_OFFSET   0x4000
-#define CONFIG_SYS_MPC512x_USB_ADDR \
-                       (CONFIG_SYS_IMMR + CONFIG_SYS_MPC512x_USB_OFFSET)
+#define CONFIG_SYS_MPC512x_USB1_OFFSET   0x4000
+#define CONFIG_SYS_MPC512x_USB1_ADDR \
+                       (CONFIG_SYS_IMMR + CONFIG_SYS_MPC512x_USB1_OFFSET)
 
 #define IIM_BASE_ADDR  (CONFIG_SYS_IMMR + offsetof(immap_t, iim))