Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / mips / mti-sead3 / sead3-net.c

diff --git a/arch/mips/mti-sead3/sead3-net.c b/arch/mips/mti-sead3/sead3-net.c
index dd11e7e..46176b8 100644 (file)
--- a/arch/mips/mti-sead3/sead3-net.c
+++ b/arch/mips/mti-sead3/sead3-net.c
@@ -7,9 +7,12 @@
  */
 #include <linux/module.h>
 #include <linux/irq.h>
+#include <linux/irqchip/mips-gic.h>
 #include <linux/platform_device.h>
 #include <linux/smsc911x.h>
 
+#include <asm/mips-boards/sead3int.h>
+
 static struct smsc911x_platform_config sead3_smsc911x_data = {
        .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
        .irq_type = SMSC911X_IRQ_TYPE_PUSH_PULL,
@@ -17,14 +20,13 @@ static struct smsc911x_platform_config sead3_smsc911x_data = {
        .phy_interface = PHY_INTERFACE_MODE_MII,
 };
 
-struct resource sead3_net_resourcess[] = {
+struct resource sead3_net_resources[] = {
        {
                .start                  = 0x1f010000,
                .end                    = 0x1f01ffff,
                .flags                  = IORESOURCE_MEM
        },
        {
-               .start                  = MIPS_CPU_IRQ_BASE + 6,
                .flags                  = IORESOURCE_IRQ
        }
 };
@@ -35,12 +37,16 @@ static struct platform_device sead3_net_device = {
        .dev                    = {
                .platform_data  = &sead3_smsc911x_data,
        },
-       .num_resources          = ARRAY_SIZE(sead3_net_resourcess),
-       .resource               = sead3_net_resourcess
+       .num_resources          = ARRAY_SIZE(sead3_net_resources),
+       .resource               = sead3_net_resources
 };
 
 static int __init sead3_net_init(void)
 {
+       if (gic_present)
+               sead3_net_resources[1].start = MIPS_GIC_IRQ_BASE + GIC_INT_NET;
+       else
+               sead3_net_resources[1].start = MIPS_CPU_IRQ_BASE + CPU_INT_NET;
        return platform_device_register(&sead3_net_device);
 }