14 files changed, 717 insertions, 24 deletions

diff --git a/arch/m68k/Kconfig.bus b/arch/m68k/Kconfig.bus
index 93ef0346b209..675b087198f6 100644
--- a/arch/m68k/Kconfig.bus
+++ b/arch/m68k/Kconfig.bus
@@ -45,6 +45,16 @@ config ISA
           (MCA) or VESA.  ISA is an older system, now being displaced by PCI;
           newer boards don't support it.  If you have ISA, say Y, otherwise N.
 
+config ATARI_ROM_ISA
+        bool "Atari ROM port ISA adapter support"
+        depends on ATARI
+        help
+          This option enables support for the ROM port ISA adapter used to
+          operate ISA cards on Atari. Only 8  bit cards are supported, and
+          no interrupt lines are connected.
+          The only driver currently using this adapter is the EtherNEC
+          driver for RTL8019AS based NE2000 compatible network cards.
+
 config GENERIC_ISA_DMA
         def_bool ISA
 
diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices
index 4bc945dfe467..d163991c5717 100644
--- a/arch/m68k/Kconfig.devices
+++ b/arch/m68k/Kconfig.devices
@@ -55,6 +55,30 @@ config NFETH
           which will emulate a regular ethernet device while presenting an
           ethertap device to the host system.
 
+config ATARI_ETHERNAT
+        bool "Atari EtherNAT Ethernet support"
+        depends on ATARI
+        ---help---
+          Say Y to include support for the EtherNAT network adapter for the
+          CT/60 extension port.
+
+          To compile the actual ethernet driver, choose Y or M for the SMC91X
+          option in the network device section; the module will be called smc91x.
+
+config ATARI_ETHERNEC
+        bool "Atari EtherNEC Ethernet support"
+        depends on ATARI_ROM_ISA
+        ---help---
+          Say Y to include support for the EtherNEC network adapter for the
+          ROM port. The driver works by polling instead of interrupts, so it
+          is quite slow.
+
+          This driver also suppports the ethernet part of the NetUSBee ROM
+          port combined Ethernet/USB adapter.
+
+          To compile the actual ethernet driver, choose Y or M in for the NE2000
+          option in the network device section; the module will be called ne.
+
 endmenu
 
 menu "Character devices"
diff --git a/arch/m68k/atari/ataints.c b/arch/m68k/atari/ataints.c
index 3f41092d1b70..20cde4e9fc77 100644
--- a/arch/m68k/atari/ataints.c
+++ b/arch/m68k/atari/ataints.c
@@ -49,6 +49,7 @@
 #include <asm/atari_stdma.h>
 #include <asm/irq.h>
 #include <asm/entry.h>
+#include <asm/io.h>
 
 
 /*
@@ -122,6 +123,136 @@ static struct irq_chip atari_irq_chip = {
 };
 
 /*
+ * ST-MFP timer D chained interrupts - each driver gets its own timer
+ * interrupt instance.
+ */
+
+struct mfptimerbase {
+        volatile struct MFP *mfp;
+        unsigned char mfp_mask, mfp_data;
+        unsigned short int_mask;
+        int handler_irq, mfptimer_irq, server_irq;
+        char *name;
+} stmfp_base = {
+        .mfp            = &st_mfp,
+        .int_mask       = 0x0,
+        .handler_irq    = IRQ_MFP_TIMD,
+        .mfptimer_irq   = IRQ_MFP_TIMER1,
+        .name           = "MFP Timer D"
+};
+
+static irqreturn_t mfptimer_handler(int irq, void *dev_id)
+{
+        struct mfptimerbase *base = dev_id;
+        int mach_irq;
+        unsigned char ints;
+
+        mach_irq = base->mfptimer_irq;
+        ints = base->int_mask;
+        for (; ints; mach_irq++, ints >>= 1) {
+                if (ints & 1)
+                        generic_handle_irq(mach_irq);
+        }
+        return IRQ_HANDLED;
+}
+
+
+static void atari_mfptimer_enable(struct irq_data *data)
+{
+        int mfp_num = data->irq - IRQ_MFP_TIMER1;
+        stmfp_base.int_mask |= 1 << mfp_num;
+        atari_enable_irq(IRQ_MFP_TIMD);
+}
+
+static void atari_mfptimer_disable(struct irq_data *data)
+{
+        int mfp_num = data->irq - IRQ_MFP_TIMER1;
+        stmfp_base.int_mask &= ~(1 << mfp_num);
+        if (!stmfp_base.int_mask)
+                atari_disable_irq(IRQ_MFP_TIMD);
+}
+
+static struct irq_chip atari_mfptimer_chip = {
+        .name           = "timer_d",
+        .irq_enable     = atari_mfptimer_enable,
+        .irq_disable    = atari_mfptimer_disable,
+};
+
+
+/*
+ * EtherNAT CPLD interrupt handling
+ * CPLD interrupt register is at phys. 0x80000023
+ * Need this mapped in at interrupt startup time
+ * Possibly need this mapped on demand anyway -
+ * EtherNAT USB driver needs to disable IRQ before
+ * startup!
+ */
+
+static unsigned char *enat_cpld;
+
+static unsigned int atari_ethernat_startup(struct irq_data *data)
+{
+        int enat_num = 140 - data->irq + 1;
+
+        m68k_irq_startup(data);
+        /*
+        * map CPLD interrupt register
+        */
+        if (!enat_cpld)
+                enat_cpld = (unsigned char *)ioremap((ATARI_ETHERNAT_PHYS_ADDR+0x23), 0x2);
+        /*
+         * do _not_ enable the USB chip interrupt here - causes interrupt storm
+         * and triggers dead interrupt watchdog
+         * Need to reset the USB chip to a sane state in early startup before
+         * removing this hack
+         */
+        if (enat_num == 1)
+                *enat_cpld |= 1 << enat_num;
+
+        return 0;
+}
+
+static void atari_ethernat_enable(struct irq_data *data)
+{
+        int enat_num = 140 - data->irq + 1;
+        /*
+        * map CPLD interrupt register
+        */
+        if (!enat_cpld)
+                enat_cpld = (unsigned char *)ioremap((ATARI_ETHERNAT_PHYS_ADDR+0x23), 0x2);
+        *enat_cpld |= 1 << enat_num;
+}
+
+static void atari_ethernat_disable(struct irq_data *data)
+{
+        int enat_num = 140 - data->irq + 1;
+        /*
+        * map CPLD interrupt register
+        */
+        if (!enat_cpld)
+                enat_cpld = (unsigned char *)ioremap((ATARI_ETHERNAT_PHYS_ADDR+0x23), 0x2);
+        *enat_cpld &= ~(1 << enat_num);
+}
+
+static void atari_ethernat_shutdown(struct irq_data *data)