patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / arch / ppc / platforms / 4xx / ibm440gp.h

diff --git a/arch/ppc/platforms/4xx/ibm440gp.h b/arch/ppc/platforms/4xx/ibm440gp.h
index b8c1a4f..ae1efc0 100644 (file)
--- a/arch/ppc/platforms/4xx/ibm440gp.h
+++ b/arch/ppc/platforms/4xx/ibm440gp.h
@@ -22,44 +22,11 @@
 
 #include <linux/config.h>
 
-#define EMAC_NUMS              2
-#define UART_NUMS              2
-#define ZMII_NUMS              1
-#define IIC_NUMS               2
-#define IIC0_IRQ               2
-#define IIC1_IRQ               3
-#define GPIO_NUMS              1
-
-/* UART location */
+/* UART */
 #define PPC440GP_UART0_ADDR    0x0000000140000200ULL
 #define PPC440GP_UART1_ADDR    0x0000000140000300ULL
-
-/* EMAC location */
-#define PPC440GP_EMAC0_ADDR    0x0000000140000800ULL
-#define PPC440GP_EMAC1_ADDR    0x0000000140000900ULL
-#define PPC440GP_EMAC_SIZE     0x70
-
-/* EMAC IRQ's */
-#define BL_MAC_WOL     61      /* WOL */
-#define BL_MAC_WOL1    63      /* WOL */
-#define BL_MAL_SERR    32      /* MAL SERR */
-#define BL_MAL_TXDE    33      /* MAL TXDE */
-#define BL_MAL_RXDE    34      /* MAL RXDE */
-#define BL_MAL_TXEOB   10      /* MAL TX EOB */
-#define BL_MAL_RXEOB   11      /* MAL RX EOB */
-#define BL_MAC_ETH0    60      /* MAC */
-#define BL_MAC_ETH1    62      /* MAC */
-
-/* ZMII location */
-#define PPC440GP_ZMII_ADDR     0x0000000140000780ULL
-#define PPC440GP_ZMII_SIZE     0x0c
-
-/* I2C location */
-#define PPC440GP_IIC0_ADDR     0x40000400
-#define PPC440GP_IIC1_ADDR     0x40000500
-
-/* GPIO location */
-#define PPC440GP_GPIO0_ADDR    0x0000000140000700ULL
+#define UART0_INT              0
+#define UART1_INT              1
 
 /* Clock and Power Management */
 #define IBM_CPM_IIC0           0x80000000      /* IIC interface */
@@ -87,9 +54,6 @@
                                | IBM_CPM_EBC | IBM_CPM_SRAM | IBM_CPM_BGO \
                                | IBM_CPM_EBM | IBM_CPM_PLB | IBM_CPM_OPB \
                                | IBM_CPM_TMRCLK | IBM_CPM_DMA | IBM_CPM_PCI)
-
-#define PPC440GP_OPB_BASE_START        0x0000000140000000ULL
-
 /*
  * Serial port defines
  */