fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / ppc / platforms / 4xx / ibm440gx.c

diff --git a/arch/ppc/platforms/4xx/ibm440gx.c b/arch/ppc/platforms/4xx/ibm440gx.c
index c23db3d..685abff 100644 (file)
--- a/arch/ppc/platforms/4xx/ibm440gx.c
+++ b/arch/ppc/platforms/4xx/ibm440gx.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/platforms/4xx/ibm440gx.c
- *
  * PPC440GX I/O descriptions
  *
  * Matt Porter <mporter@mvista.com>
@@ -19,6 +17,7 @@
 #include <linux/module.h>
 #include <platforms/4xx/ibm440gx.h>
 #include <asm/ocp.h>
+#include <asm/ppc4xx_pic.h>
 
 static struct ocp_func_emac_data ibm440gx_emac0_def = {
        .rgmii_idx      = -1,           /* No RGMII */
@@ -57,7 +56,6 @@ static struct ocp_func_emac_data ibm440gx_emac2_def = {
        .wol_irq        = 65,           /* WOL interrupt number */
        .mdio_idx       = -1,           /* No shared MDIO */
        .tah_idx        = 0,            /* TAH device index */
-       .jumbo          = 1,            /* Jumbo frames supported */
 };
 
 static struct ocp_func_emac_data ibm440gx_emac3_def = {
@@ -71,7 +69,6 @@ static struct ocp_func_emac_data ibm440gx_emac3_def = {
        .wol_irq        = 67,           /* WOL interrupt number */
        .mdio_idx       = -1,           /* No shared MDIO */
        .tah_idx        = 1,            /* TAH device index */
-       .jumbo          = 1,            /* Jumbo frames supported */
 };
 OCP_SYSFS_EMAC_DATA()
 
@@ -83,6 +80,7 @@ static struct ocp_func_mal_data ibm440gx_mal0_def = {
        .txde_irq       = 33,           /* TX Descriptor Error IRQ */
        .rxde_irq       = 34,           /* RX Descriptor Error IRQ */
        .serr_irq       = 32,           /* MAL System Error IRQ    */
+       .dcr_base       = DCRN_MAL_BASE /* MAL0_CFG DCR number */
 };
 OCP_SYSFS_MAL_DATA()
 
@@ -215,3 +213,19 @@ struct ocp_def core_ocp[] = {
        { .vendor       = OCP_VENDOR_INVALID
        }
 };
+
+/* Polarity and triggering settings for internal interrupt sources */
+struct ppc4xx_uic_settings ppc4xx_core_uic_cfg[] __initdata = {
+       { .polarity     = 0xfffffe03,
+         .triggering   = 0x01c00000,
+         .ext_irq_mask = 0x000001fc,   /* IRQ0 - IRQ6 */
+       },
+       { .polarity     = 0xffffc0ff,
+         .triggering   = 0x00ff8000,
+         .ext_irq_mask = 0x00003f00,   /* IRQ7 - IRQ12 */
+       },
+       { .polarity     = 0xffff83ff,
+         .triggering   = 0x000f83c0,
+         .ext_irq_mask = 0x00007c00,   /* IRQ13 - IRQ17 */
+       },
+};