-#define MV64x60_PCI0_MEM_0_SIZE 0x0c08
-#define MV64x60_PCI0_MEM_1_SIZE 0x0d08
-#define MV64x60_PCI0_MEM_2_SIZE 0x0c0c
-#define MV64x60_PCI0_MEM_3_SIZE 0x0d0c
-#define MV64x60_PCI1_MEM_0_SIZE 0x0c88
-#define MV64x60_PCI1_MEM_1_SIZE 0x0d88
-#define MV64x60_PCI1_MEM_2_SIZE 0x0c8c
-#define MV64x60_PCI1_MEM_3_SIZE 0x0d8c
-
-#define MV64x60_PCI0_BAR_ENABLE 0x0c3c
-#define MV64x60_PCI1_BAR_ENABLE 0x0cbc
-
-#define MV64x60_PCI0_PCI_DECODE_CNTL 0x0d3c
-
-
-
-
-
-#define MV64x60_PCI0_SLAVE_BAR_REG_ENABLES 0x0c3c
-#define MV64x60_PCI0_SLAVE_MEM_0_REMAP 0x0c48
-#define MV64x60_PCI0_SLAVE_MEM_1_REMAP 0x0d48
-#define MV64x60_PCI0_SLAVE_MEM_2_REMAP 0x0c4c
-#define MV64x60_PCI0_SLAVE_MEM_3_REMAP 0x0d4c
-#define MV64x60_PCI0_SLAVE_CS_0_REMAP 0x0c50
-#define MV64x60_PCI0_SLAVE_CS_1_REMAP 0x0d50
-#define MV64x60_PCI0_SLAVE_CS_2_REMAP 0x0d58
-#define MV64x60_PCI0_SLAVE_CS_3_REMAP 0x0c54
-#define MV64x60_PCI0_SLAVE_BOOT_REMAP 0x0d54
-#define MV64x60_PCI0_SLAVE_P2P_MEM_0_REMAP_LO 0x0d5c
-#define MV64x60_PCI0_SLAVE_P2P_MEM_0_REMAP_HI 0x0d60
-#define MV64x60_PCI0_SLAVE_P2P_MEM_1_REMAP_LO 0x0d64
-#define MV64x60_PCI0_SLAVE_P2P_MEM_1_REMAP_HI 0x0d68
-#define MV64x60_PCI0_SLAVE_P2P_IO_REMAP 0x0d6c
-#define MV64x60_PCI0_SLAVE_CPU_REMAP 0x0d70
-
-#define GT64260_PCI0_SLAVE_DAC_SCS_0_REMAP 0x0f00
-#define GT64260_PCI0_SLAVE_DAC_SCS_1_REMAP 0x0f04
-#define GT64260_PCI0_SLAVE_DAC_SCS_2_REMAP 0x0f08
-#define GT64260_PCI0_SLAVE_DAC_SCS_3_REMAP 0x0f0c
-#define GT64260_PCI0_SLAVE_DAC_CS_0_REMAP 0x0f10
-#define GT64260_PCI0_SLAVE_DAC_CS_1_REMAP 0x0f14
-#define GT64260_PCI0_SLAVE_DAC_CS_2_REMAP 0x0f18
-#define GT64260_PCI0_SLAVE_DAC_CS_3_REMAP 0x0f1c
-#define GT64260_PCI0_SLAVE_DAC_BOOT_REMAP 0x0f20
-#define GT64260_PCI0_SLAVE_DAC_P2P_MEM_0_REMAP_LO 0x0f24
-#define GT64260_PCI0_SLAVE_DAC_P2P_MEM_0_REMAP_HI 0x0f28
-#define GT64260_PCI0_SLAVE_DAC_P2P_MEM_1_REMAP_LO 0x0f2c
-#define GT64260_PCI0_SLAVE_DAC_P2P_MEM_1_REMAP_HI 0x0f30
-#define GT64260_PCI0_SLAVE_DAC_CPU_REMAP 0x0f34
-
-#define GT64260_PCI0_SLAVE_EXP_ROM_REMAP 0x0f38
-#define GT64260_PCI0_SLAVE_PCI_DECODE_CNTL 0x0d3c
-
-
-
-
-
-/* XXXX BEGIN */
-#define MV64x60_PCI1_PCI_DECODE_CNTL 0x0dbc
-
-#define MV64x60_PCI1_SLAVE_MEM_0_SIZE 0x0c88
-#define MV64x60_PCI1_SLAVE_MEM_1_SIZE 0x0d88
-#define MV64x60_PCI1_SLAVE_MEM_2_SIZE 0x0c8c
-#define MV64x60_PCI1_SLAVE_MEM_3_SIZE 0x0d8c
-#define MV64x60_PCI1_SLAVE_CS_0_SIZE 0x0c90
-#define MV64x60_PCI1_SLAVE_CS_1_SIZE 0x0d90
-#define MV64x60_PCI1_SLAVE_CS_2_SIZE 0x0d98
-#define MV64x60_PCI1_SLAVE_CS_3_SIZE 0x0c94
-#define MV64x60_PCI1_SLAVE_BOOT_SIZE 0x0d94
-#define MV64x60_PCI1_SLAVE_P2P_MEM_0_SIZE 0x0d9c
-#define MV64x60_PCI1_SLAVE_P2P_MEM_1_SIZE 0x0da0
-#define MV64x60_PCI1_SLAVE_P2P_IO_SIZE 0x0da4
-#define MV64x60_PCI1_SLAVE_CPU_SIZE 0x0da8
-
-
-/* XXXXX END */
-
-
-#define GT64260_PCI1_SLAVE_DAC_SCS_0_SIZE 0x0e80
-#define GT64260_PCI1_SLAVE_DAC_SCS_1_SIZE 0x0e84
-#define GT64260_PCI1_SLAVE_DAC_SCS_2_SIZE 0x0e88
-#define GT64260_PCI1_SLAVE_DAC_SCS_3_SIZE 0x0e8c
-#define GT64260_PCI1_SLAVE_DAC_CS_0_SIZE 0x0e90
-#define GT64260_PCI1_SLAVE_DAC_CS_1_SIZE 0x0e94
-#define GT64260_PCI1_SLAVE_DAC_CS_2_SIZE 0x0e98
-#define GT64260_PCI1_SLAVE_DAC_CS_3_SIZE 0x0e9c
-#define GT64260_PCI1_SLAVE_DAC_BOOT_SIZE 0x0ea0
-#define GT64260_PCI1_SLAVE_DAC_P2P_MEM_0_SIZE 0x0ea4
-#define GT64260_PCI1_SLAVE_DAC_P2P_MEM_1_SIZE 0x0ea8
-#define GT64260_PCI1_SLAVE_DAC_CPU_SIZE 0x0eac
-
-#define GT64260_PCI1_SLAVE_EXP_ROM_SIZE 0x0dac
-
-
-
-
-/* XXXX BEGIN */
-
-#define MV64x60_PCI1_SLAVE_BAR_REG_ENABLES 0x0cbc
-#define MV64x60_PCI1_SLAVE_MEM_0_REMAP 0x0cc8
-#define MV64x60_PCI1_SLAVE_MEM_1_REMAP 0x0dc8
-#define MV64x60_PCI1_SLAVE_MEM_2_REMAP 0x0ccc
-#define MV64x60_PCI1_SLAVE_MEM_3_REMAP 0x0dcc
-#define MV64x60_PCI1_SLAVE_CS_0_REMAP 0x0cd0
-#define MV64x60_PCI1_SLAVE_CS_1_REMAP 0x0dd0
-#define MV64x60_PCI1_SLAVE_CS_2_REMAP 0x0dd8
-#define MV64x60_PCI1_SLAVE_CS_3_REMAP 0x0cd4
-#define MV64x60_PCI1_SLAVE_BOOT_REMAP 0x0dd4
-#define MV64x60_PCI1_SLAVE_P2P_MEM_0_REMAP_LO 0x0ddc
-#define MV64x60_PCI1_SLAVE_P2P_MEM_0_REMAP_HI 0x0de0
-#define MV64x60_PCI1_SLAVE_P2P_MEM_1_REMAP_LO 0x0de4
-#define MV64x60_PCI1_SLAVE_P2P_MEM_1_REMAP_HI 0x0de8
-#define MV64x60_PCI1_SLAVE_P2P_IO_REMAP 0x0dec
-#define MV64x60_PCI1_SLAVE_CPU_REMAP 0x0df0
-
-/* XXXXX END */
-
-
-
-#define GT64260_PCI1_SLAVE_DAC_SCS_0_REMAP 0x0f80
-#define GT64260_PCI1_SLAVE_DAC_SCS_1_REMAP 0x0f84
-#define GT64260_PCI1_SLAVE_DAC_SCS_2_REMAP 0x0f88
-#define GT64260_PCI1_SLAVE_DAC_SCS_3_REMAP 0x0f8c
-#define GT64260_PCI1_SLAVE_DAC_CS_0_REMAP 0x0f90
-#define GT64260_PCI1_SLAVE_DAC_CS_1_REMAP 0x0f94
-#define GT64260_PCI1_SLAVE_DAC_CS_2_REMAP 0x0f98
-#define GT64260_PCI1_SLAVE_DAC_CS_3_REMAP 0x0f9c
-#define GT64260_PCI1_SLAVE_DAC_BOOT_REMAP 0x0fa0
-#define GT64260_PCI1_SLAVE_DAC_P2P_MEM_0_REMAP_LO 0x0fa4
-#define GT64260_PCI1_SLAVE_DAC_P2P_MEM_0_REMAP_HI 0x0fa8
-#define GT64260_PCI1_SLAVE_DAC_P2P_MEM_1_REMAP_LO 0x0fac
-#define GT64260_PCI1_SLAVE_DAC_P2P_MEM_1_REMAP_HI 0x0fb0
-#define GT64260_PCI1_SLAVE_DAC_CPU_REMAP 0x0fb4
-
-#define GT64260_PCI1_SLAVE_EXP_ROM_REMAP 0x0fb8
-#define GT64260_PCI1_SLAVE_PCI_DECODE_CNTL 0x0dbc
-
+#define MV64x60_PCI0_MEM_0_SIZE 0x0c08
+#define MV64x60_PCI0_MEM_1_SIZE 0x0d08
+#define MV64x60_PCI0_MEM_2_SIZE 0x0c0c
+#define MV64x60_PCI0_MEM_3_SIZE 0x0d0c
+#define MV64x60_PCI1_MEM_0_SIZE 0x0c88
+#define MV64x60_PCI1_MEM_1_SIZE 0x0d88
+#define MV64x60_PCI1_MEM_2_SIZE 0x0c8c
+#define MV64x60_PCI1_MEM_3_SIZE 0x0d8c
+
+#define MV64x60_PCI0_BAR_ENABLE 0x0c3c
+#define MV64x60_PCI1_BAR_ENABLE 0x0cbc
+
+#define MV64x60_PCI0_PCI_DECODE_CNTL 0x0d3c
+#define MV64x60_PCI1_PCI_DECODE_CNTL 0x0dbc
+
+#define MV64x60_PCI0_SLAVE_MEM_0_REMAP 0x0c48
+#define MV64x60_PCI0_SLAVE_MEM_1_REMAP 0x0d48
+#define MV64x60_PCI0_SLAVE_MEM_2_REMAP 0x0c4c
+#define MV64x60_PCI0_SLAVE_MEM_3_REMAP 0x0d4c
+#define MV64x60_PCI0_SLAVE_DEV_0_REMAP 0x0c50
+#define MV64x60_PCI0_SLAVE_DEV_1_REMAP 0x0d50
+#define MV64x60_PCI0_SLAVE_DEV_2_REMAP 0x0d58
+#define MV64x60_PCI0_SLAVE_DEV_3_REMAP 0x0c54
+#define MV64x60_PCI0_SLAVE_BOOT_REMAP 0x0d54
+#define MV64x60_PCI0_SLAVE_P2P_MEM_0_REMAP_LO 0x0d5c
+#define MV64x60_PCI0_SLAVE_P2P_MEM_0_REMAP_HI 0x0d60
+#define MV64x60_PCI0_SLAVE_P2P_MEM_1_REMAP_LO 0x0d64
+#define MV64x60_PCI0_SLAVE_P2P_MEM_1_REMAP_HI 0x0d68
+#define MV64x60_PCI0_SLAVE_P2P_IO_REMAP 0x0d6c
+#define MV64x60_PCI0_SLAVE_CPU_REMAP 0x0d70
+
+#define MV64x60_PCI1_SLAVE_MEM_0_REMAP 0x0cc8
+#define MV64x60_PCI1_SLAVE_MEM_1_REMAP 0x0dc8
+#define MV64x60_PCI1_SLAVE_MEM_2_REMAP 0x0ccc
+#define MV64x60_PCI1_SLAVE_MEM_3_REMAP 0x0dcc
+#define MV64x60_PCI1_SLAVE_DEV_0_REMAP 0x0cd0
+#define MV64x60_PCI1_SLAVE_DEV_1_REMAP 0x0dd0
+#define MV64x60_PCI1_SLAVE_DEV_2_REMAP 0x0dd8
+#define MV64x60_PCI1_SLAVE_DEV_3_REMAP 0x0cd4
+#define MV64x60_PCI1_SLAVE_BOOT_REMAP 0x0dd4
+#define MV64x60_PCI1_SLAVE_P2P_MEM_0_REMAP_LO 0x0ddc
+#define MV64x60_PCI1_SLAVE_P2P_MEM_0_REMAP_HI 0x0de0
+#define MV64x60_PCI1_SLAVE_P2P_MEM_1_REMAP_LO 0x0de4
+#define MV64x60_PCI1_SLAVE_P2P_MEM_1_REMAP_HI 0x0de8
+#define MV64x60_PCI1_SLAVE_P2P_IO_REMAP 0x0dec
+#define MV64x60_PCI1_SLAVE_CPU_REMAP 0x0df0
+
+#define MV64360_PCICFG_CPCI_HOTSWAP 0x68