diff options
Diffstat (limited to 'include/asm-ppc')
-rw-r--r-- | include/asm-ppc/ibm_ocp.h | 1 | ||||
-rw-r--r-- | include/asm-ppc/io.h | 2 | ||||
-rw-r--r-- | include/asm-ppc/mpc52xx.h | 13 |
3 files changed, 14 insertions, 2 deletions
diff --git a/include/asm-ppc/ibm_ocp.h b/include/asm-ppc/ibm_ocp.h index 9c21de1ff4ed..ddce616f765a 100644 --- a/include/asm-ppc/ibm_ocp.h +++ b/include/asm-ppc/ibm_ocp.h | |||
@@ -63,7 +63,6 @@ struct ocp_func_emac_data { | |||
63 | int wol_irq; /* WOL interrupt */ | 63 | int wol_irq; /* WOL interrupt */ |
64 | int mdio_idx; /* EMAC idx of MDIO master or -1 */ | 64 | int mdio_idx; /* EMAC idx of MDIO master or -1 */ |
65 | int tah_idx; /* TAH device index or -1 */ | 65 | int tah_idx; /* TAH device index or -1 */ |
66 | int jumbo; /* Jumbo frames capable flag */ | ||
67 | int phy_mode; /* PHY type or configurable mode */ | 66 | int phy_mode; /* PHY type or configurable mode */ |
68 | u8 mac_addr[6]; /* EMAC mac address */ | 67 | u8 mac_addr[6]; /* EMAC mac address */ |
69 | u32 phy_map; /* EMAC phy map */ | 68 | u32 phy_map; /* EMAC phy map */ |
diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h index 84ac6e258eef..df9cf6ed189d 100644 --- a/include/asm-ppc/io.h +++ b/include/asm-ppc/io.h | |||
@@ -27,6 +27,8 @@ | |||
27 | 27 | ||
28 | #if defined(CONFIG_4xx) | 28 | #if defined(CONFIG_4xx) |
29 | #include <asm/ibm4xx.h> | 29 | #include <asm/ibm4xx.h> |
30 | #elif defined(CONFIG_PPC_MPC52xx) | ||
31 | #include <asm/mpc52xx.h> | ||
30 | #elif defined(CONFIG_8xx) | 32 | #elif defined(CONFIG_8xx) |
31 | #include <asm/mpc8xx.h> | 33 | #include <asm/mpc8xx.h> |
32 | #elif defined(CONFIG_8260) | 34 | #elif defined(CONFIG_8260) |
diff --git a/include/asm-ppc/mpc52xx.h b/include/asm-ppc/mpc52xx.h index e5f80c22fbfc..a055e0756b9d 100644 --- a/include/asm-ppc/mpc52xx.h +++ b/include/asm-ppc/mpc52xx.h | |||
@@ -29,6 +29,17 @@ struct pt_regs; | |||
29 | #endif /* __ASSEMBLY__ */ | 29 | #endif /* __ASSEMBLY__ */ |
30 | 30 | ||
31 | 31 | ||
32 | #ifdef CONFIG_PCI | ||
33 | #define _IO_BASE isa_io_base | ||
34 | #define _ISA_MEM_BASE isa_mem_base | ||
35 | #define PCI_DRAM_OFFSET pci_dram_offset | ||
36 | #else | ||
37 | #define _IO_BASE 0 | ||
38 | #define _ISA_MEM_BASE 0 | ||
39 | #define PCI_DRAM_OFFSET 0 | ||
40 | #endif | ||
41 | |||
42 | |||
32 | /* ======================================================================== */ | 43 | /* ======================================================================== */ |
33 | /* PPC Sys devices definition */ | 44 | /* PPC Sys devices definition */ |
34 | /* ======================================================================== */ | 45 | /* ======================================================================== */ |
@@ -107,7 +118,7 @@ enum ppc_sys_devices { | |||
107 | #define MPC52xx_SDMA_IRQ_NUM 17 | 118 | #define MPC52xx_SDMA_IRQ_NUM 17 |
108 | #define MPC52xx_PERP_IRQ_NUM 23 | 119 | #define MPC52xx_PERP_IRQ_NUM 23 |
109 | 120 | ||
110 | #define MPC52xx_CRIT_IRQ_BASE 0 | 121 | #define MPC52xx_CRIT_IRQ_BASE 1 |
111 | #define MPC52xx_MAIN_IRQ_BASE (MPC52xx_CRIT_IRQ_BASE + MPC52xx_CRIT_IRQ_NUM) | 122 | #define MPC52xx_MAIN_IRQ_BASE (MPC52xx_CRIT_IRQ_BASE + MPC52xx_CRIT_IRQ_NUM) |
112 | #define MPC52xx_SDMA_IRQ_BASE (MPC52xx_MAIN_IRQ_BASE + MPC52xx_MAIN_IRQ_NUM) | 123 | #define MPC52xx_SDMA_IRQ_BASE (MPC52xx_MAIN_IRQ_BASE + MPC52xx_MAIN_IRQ_NUM) |
113 | #define MPC52xx_PERP_IRQ_BASE (MPC52xx_SDMA_IRQ_BASE + MPC52xx_SDMA_IRQ_NUM) | 124 | #define MPC52xx_PERP_IRQ_BASE (MPC52xx_SDMA_IRQ_BASE + MPC52xx_SDMA_IRQ_NUM) |