Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k update from Geert Uytterhoeven.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Remove inline strlen() implementation
  m68k/atari: USB - add platform devices for EtherNAT/NetUSBee ISP1160 HCD
  m68k: Implement ndelay() based on the existing udelay() logic
  m68k/atari: EtherNAT - add interrupt chip definition for CPLD interrupts
  m68k/atari: EtherNEC - add platform device support
  m68k/atari: EtherNAT - platform device and IRQ support code
  m68k/atari: use dedicated irq_chip for timer D interrupts
  m68k/atari: ROM port ISA adapter support
  m68k: Add missing cmpxchg64() if CONFIG_RMW_INSNS=y

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)
+{
+        int enat_num = 140 - data->irq + 1;
+        if (enat_cpld) {
+                *enat_cpld &= ~(1 << enat_num);
+                iounmap(enat_cpld);
+                enat_cpld = NULL;
+        }
+}
+
+static struct irq_chip atari_ethernat_chip = {
+        .name           = "ethernat",
+        .irq_startup    = atari_ethernat_startup,
+        .irq_shutdown   = atari_ethernat_shutdown,
+        .irq_enable     = atari_ethernat_enable,
+        .irq_disable    = atari_ethernat_disable,
+};
+
+/*
  * void atari_init_IRQ (void)
  *
  * Parameters:  None
@@ -198,6 +329,27 @@ void __init atari_init_IRQ(void)
         /* Initialize the PSG: all sounds off, both ports output */
         sound_ym.rd_data_reg_sel = 7;
         sound_ym.wd_data = 0xff;
+
+        m68k_setup_irq_controller(&atari_mfptimer_chip, handle_simple_irq,
+                                  IRQ_MFP_TIMER1, 8);
+
+        /* prepare timer D data for use as poll interrupt */
+        /* set Timer D data Register - needs to be > 0 */
+        st_mfp.tim_dt_d = 254;  /* < 100 Hz */
+        /* start timer D, div = 1:100 */
+        st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd & 0xf0) | 0x6;
+
+        /* request timer D dispatch handler */
+        if (request_irq(IRQ_MFP_TIMD, mfptimer_handler, IRQF_SHARED,
+                        stmfp_base.name, &stmfp_base))
+                pr_err("Couldn't register %s interrupt\n", stmfp_base.name);
+
+        /*
+         * EtherNAT ethernet / USB interrupt handlers
+         */
+
+        m68k_setup_irq_controller(&atari_ethernat_chip, handle_simple_irq,
+                                  139, 2);
 }
 
 
diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c
index 037c11c99331..fb2d0bd9b3ad 100644
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
@@ -31,6 +31,8 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
+#include <linux/platform_device.h>
+#include <linux/usb/isp116x.h>
 #include <linux/vt_kern.h>
 #include <linux/module.h>
 
@@ -655,3 +657,240 @@ static void atari_get_hardware_list(struct seq_file *m)
         ATARIHW_ANNOUNCE(VME, "VME Bus");
         ATARIHW_ANNOUNCE(DSP56K, "DSP56001 processor");
 }
+
+/*
+ * MSch: initial platform device support for Atari,
+ * required for EtherNAT/EtherNEC/NetUSBee drivers
+ */
+
+#if defined(CONFIG_ATARI_ETHERNAT) || defined(CONFIG_ATARI_ETHERNEC)
+static void isp1160_delay(struct device *dev, int delay)
+{
+        ndelay(delay);
+}
+#endif
+
+#ifdef CONFIG_ATARI_ETHERNAT
+/*
+ * EtherNAT: SMC91C111 Ethernet chipset, handled by smc91x driver
+ */
+
+#define ATARI_ETHERNAT_IRQ              140
+
+static struct resource smc91x_resources[] = {
+        [0] = {
+                .name   = "smc91x-regs",
+                .start  = ATARI_ETHERNAT_PHYS_ADDR,
+                .end    = ATARI_ETHERNAT_PHYS_ADDR + 0xfffff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .name   = "smc91x-irq",
+                .start  = ATARI_ETHERNAT_IRQ,
+                .end    = ATARI_ETHERNAT_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device smc91x_device = {
+        .name           = "smc91x",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(smc91x_resources),
+        .resource       = smc91x_resources,
+};
+
+/*
+ * ISP 1160 - using the isp116x-hcd module
+ */
+
+#define ATARI_USB_PHYS_ADDR     0x80000012
+#define ATARI_USB_IRQ           139
+
+static struct resource isp1160_resources[] = {
+        [0] = {
+                .name   = "isp1160-data",
+                .start  = ATARI_USB_PHYS_ADDR,
+                .end    = ATARI_USB_PHYS_ADDR + 0x1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .name   = "isp1160-regs",
+                .start  = ATARI_USB_PHYS_ADDR + 0x4,
+                .end    = ATARI_USB_PHYS_ADDR + 0x5,
+                .flags  = IORESOURCE_MEM,
+        },
+        [2] = {
+                .name   = "isp1160-irq",
+                .start  = ATARI_USB_IRQ,
+                .end    = ATARI_USB_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+/* (DataBusWidth16|AnalogOCEnable|DREQOutputPolarity|DownstreamPort15KRSel ) */
+static struct isp116x_platform_data isp1160_platform_data = {
+        /* Enable internal resistors on downstream ports */
+        .sel15Kres              = 1,
+        /* On-chip overcurrent protection */
+        .oc_enable              = 1,
+        /* INT output polarity */
+        .int_act_high           = 1,
+        /* INT edge or level triggered */
+        .int_edge_triggered     = 0,
+
+        /* WAKEUP pin connected - NOT SUPPORTED  */
+        /* .remote_wakeup_connected = 0, */
+        /* Wakeup by devices on usb bus enabled */
+        .remote_wakeup_enable   = 0,
+        .delay                  = isp1160_delay,
+};
+
+static struct platform_device isp1160_device = {
+        .name           = "isp116x-hcd",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(isp1160_resources),
+        .resource       = isp1160_resources,
+        .dev                    = {
+                .platform_data  = &isp1160_platform_data,
+        },
+};
+
+static struct platform_device *atari_ethernat_devices[] __initdata = {
+        &smc91x_device,
+        &isp1160_device
+};
+#endif /* CONFIG_ATARI_ETHERNAT */
+
+#ifdef CONFIG_ATARI_ETHERNEC
+/*
+ * EtherNEC: RTL8019 (NE2000 compatible) Ethernet chipset,
+ * handled by ne.c driver
+ */
+
+#define ATARI_ETHERNEC_PHYS_ADDR        0xfffa0000
+#define ATARI_ETHERNEC_BASE             0x300
+#define ATARI_ETHERNEC_IRQ              IRQ_MFP_TIMER1
+
+static struct resource rtl8019_resources[] = {
+        [0] = {
+                .name   = "rtl8019-regs",
+                .start  = ATARI_ETHERNEC_BASE,
+                .end    = ATARI_ETHERNEC_BASE + 0x20 - 1,
+                .flags  = IORESOURCE_IO,
+        },
+        [1] = {
+                .name   = "rtl8019-irq",
+                .start  = ATARI_ETHERNEC_IRQ,
+                .end    = ATARI_ETHERNEC_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device rtl8019_device = {
+        .name           = "ne",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(rtl8019_resources),
+        .resource       = rtl8019_resources,
+};
+
+/*
+ * NetUSBee: ISP1160 USB host adapter via ROM-port adapter
+ */
+
+#define ATARI_NETUSBEE_PHYS_ADDR        0xfffa8000
+#define ATARI_NETUSBEE_BASE             0x340
+#define ATARI_NETUSBEE_IRQ              IRQ_MFP_TIMER2
+
+static struct resource netusbee_resources[] = {
+        [0] = {
+                .name   = "isp1160-data",
+                .start  = ATARI_NETUSBEE_BASE,
+                .end    = ATARI_NETUSBEE_BASE + 0x1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .name   = "isp1160-regs",
+                .start  = ATARI_NETUSBEE_BASE + 0x20,
+                .end    = ATARI_NETUSBEE_BASE + 0x21,
+                .flags  = IORESOURCE_MEM,
+        },
+        [2] = {
+                .name   = "isp1160-irq",
+                .start  = ATARI_NETUSBEE_IRQ,
+                .end    = ATARI_NETUSBEE_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+/* (DataBusWidth16|AnalogOCEnable|DREQOutputPolarity|DownstreamPort15KRSel ) */
+static struct isp116x_platform_data netusbee_platform_data = {
+        /* Enable internal resistors on downstream ports */
+        .sel15Kres              = 1,
+        /* On-chip overcurrent protection */
+        .oc_enable              = 1,
+        /* INT output polarity */
+        .int_act_high           = 1,
+        /* INT edge or level triggered */
+        .int_edge_triggered     = 0,
+
+        /* WAKEUP pin connected - NOT SUPPORTED  */
+        /* .remote_wakeup_connected = 0, */
+        /* Wakeup by devices on usb bus enabled */
+        .remote_wakeup_enable   = 0,
+        .delay                  = isp1160_delay,
+};
+
+static struct platform_device netusbee_device = {
+        .name           = "isp116x-hcd",
+        .id             = 1,
+        .num_resources  = ARRAY_SIZE(netusbee_resources),
+        .resource       = netusbee_resources,
+        .dev                    = {
+                .platform_data  = &netusbee_platform_data,
+        },
+};
+
+static struct platform_device *atari_netusbee_devices[] __initdata = {
+        &rtl8019_device,
+        &netusbee_device
+};
+#endif /* CONFIG_ATARI_ETHERNEC */
+
+int __init atari_platform_init(void)
+{
+        int rv = 0;
+
+        if (!MACH_IS_ATARI)
+                return -ENODEV;
+
+#ifdef CONFIG_ATARI_ETHERNAT
+        {
+                unsigned char *enatc_virt;
+                enatc_virt = (unsigned char *)ioremap((ATARI_ETHERNAT_PHYS_ADDR+0x23), 0xf);
+                if (hwreg_present(enatc_virt)) {
+                        rv = platform_add_devices(atari_ethernat_devices,
+                                                ARRAY_SIZE(atari_ethernat_devices));
+                }
+                iounmap(enatc_virt);
+        }
+#endif
+
+#ifdef CONFIG_ATARI_ETHERNEC
+        {
+                int error;
+                unsigned char *enec_virt;
+                enec_virt = (unsigned char *)ioremap((ATARI_ETHERNEC_PHYS_ADDR), 0xf);
+                if (hwreg_present(enec_virt)) {
+                        error = platform_add_devices(atari_netusbee_devices,
+                                                ARRAY_SIZE(atari_netusbee_devices));
+                        if (error && !rv)
+                                rv = error;
+                }
+                iounmap(enec_virt);
+        }
+#endif
+
+        return rv;
+}
+
+arch_initcall(atari_platform_init);
diff --git a/arch/m68k/include/asm/atarihw.h b/arch/m68k/include/asm/atarihw.h
index c0cb36350775..d887050e6da6 100644
--- a/arch/m68k/include/asm/atarihw.h
+++ b/arch/m68k/include/asm/atarihw.h
@@ -805,5 +805,11 @@ struct MSTE_RTC {
 
 #define mste_rtc ((*(volatile struct MSTE_RTC *)MSTE_RTC_BAS))
 
+/*
+** EtherNAT add-on card for Falcon - combined ethernet and USB adapter
+*/
+
+#define ATARI_ETHERNAT_PHYS_ADDR        0x80000000
+
 #endif /* linux/atarihw.h */
 
diff --git a/arch/m68k/include/asm/atariints.h b/arch/m68k/include/asm/atariints.h
index 5fc13bdf9044..953e0ac6855e 100644
--- a/arch/m68k/include/asm/atariints.h
+++ b/arch/m68k/include/asm/atariints.h
@@ -32,7 +32,7 @@
 #define VME_SOURCE_BASE    56
 #define VME_MAX_SOURCES    16
 
-#define NUM_ATARI_SOURCES   (VME_SOURCE_BASE+VME_MAX_SOURCES-STMFP_SOURCE_BASE)
+#define NUM_ATARI_SOURCES  141
 
 /* convert vector number to int source number */
 #define IRQ_VECTOR_TO_SOURCE(v) ((v) - ((v) < 0x20 ? 0x18 : (0x40-8)))
@@ -94,6 +94,15 @@
 #define IRQ_SCCA_RX          (52)
 #define IRQ_SCCA_SPCOND      (54)
 
+/* shared MFP timer D interrupts - hires timer for EtherNEC et al. */
+#define IRQ_MFP_TIMER1       (64)
+#define IRQ_MFP_TIMER2       (65)
+#define IRQ_MFP_TIMER3       (66)
+#define IRQ_MFP_TIMER4       (67)
+#define IRQ_MFP_TIMER5       (68)
+#define IRQ_MFP_TIMER6       (69)
+#define IRQ_MFP_TIMER7       (70)
+#define IRQ_MFP_TIMER8       (71)
 
 #define INT_CLK   24576     /* CLK while int_clk =2.456MHz and divide = 100 */
 #define INT_TICKS 246       /* to make sched_time = 99.902... HZ */
diff --git a/arch/m68k/include/asm/cmpxchg.h b/arch/m68k/include/asm/cmpxchg.h
index 5c81d0eae5cf..bc755bc620ad 100644
--- a/arch/m68k/include/asm/cmpxchg.h
+++ b/arch/m68k/include/asm/cmpxchg.h
@@ -124,6 +124,9 @@ static inline unsigned long __cmpxchg(volatile void *p, unsigned long old,
 #define cmpxchg_local(ptr, o, n)                                            \
         ((__typeof__(*(ptr)))__cmpxchg((ptr), (unsigned long)(o),           \
                         (unsigned long)(n), sizeof(*(ptr))))
+
+#define cmpxchg64(ptr, o, n)    cmpxchg64_local((ptr), (o), (n))
+
 #else
 
 /*
diff --git a/arch/m68k/include/asm/delay.h b/arch/m68k/include/asm/delay.h
index 12d8fe4f1d30..d28fa8fe26fe 100644
--- a/arch/m68k/include/asm/delay.h
+++ b/arch/m68k/include/asm/delay.h
@@ -92,5 +92,28 @@ static inline void __udelay(unsigned long usecs)
 #define udelay(n) (__builtin_constant_p(n) ? \
         ((n) > 20000 ? __bad_udelay() : __const_udelay(n)) : __udelay(n))
 
+/*
+ * nanosecond delay:
+ *
+ * ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6) is the number of loops
+ * per microsecond
+ *
+ * 1000 / ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6) is the number of
+ * nanoseconds per loop
+ *
+ * So n / ( 1000 / ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6) ) would
+ * be the number of loops for n nanoseconds
+ */
+
+/*
+ * The simpler m68k and ColdFire processors do not have a 32*32->64
+ * multiply instruction. So we need to handle them a little differently.
+ * We use a bit of shifting and a single 32*32->32 multiply to get close.
+ * This is a macro so that the const version can factor out the first
+ * multiply and shift.
+ */
+#define HZSCALE         (268435456 / (1000000 / HZ))
+
+#define ndelay(n) __delay(DIV_ROUND_UP((n) * ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6), 1000));
 
 #endif /* defined(_M68K_DELAY_H) */
diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h
index a6686d26fe17..ffdf54f44bc6 100644
--- a/arch/m68k/include/asm/io_mm.h
+++ b/arch/m68k/include/asm/io_mm.h
@@ -63,6 +63,23 @@
 #endif
 #endif /* AMIGA_PCMCIA */
 
+#ifdef CONFIG_ATARI_ROM_ISA
+
+#define enec_isa_read_base  0xfffa0000
+#define enec_isa_write_base 0xfffb0000
+
+#define ENEC_ISA_IO_B(ioaddr)   (enec_isa_read_base+((((unsigned long)(ioaddr))&0x7F)<<9))
+#define ENEC_ISA_IO_W(ioaddr)   (enec_isa_read_base+((((unsigned long)(ioaddr))&0x7F)<<9))
+#define ENEC_ISA_MEM_B(madr)    (enec_isa_read_base+((((unsigned long)(madr))&0x7F)<<9))
+#define ENEC_ISA_MEM_W(madr)    (enec_isa_read_base+((((unsigned long)(madr))&0x7F)<<9))
+
+#ifndef MULTI_ISA
+#define MULTI_ISA 0
+#else
+#undef MULTI_ISA
+#define MULTI_ISA 1
+#endif
+#endif /* ATARI_ROM_ISA */
 
 
 #if defined(CONFIG_PCI) && defined(CONFIG_COLDFIRE)
@@ -111,14 +128,15 @@ void mcf_pci_outsl(u32 addr, const u32 *buf, u32 len);
 #define readw(addr)     in_le16(addr)
 #define writew(v, addr) out_le16((addr), (v))
 
-#elif defined(CONFIG_ISA)
+#elif defined(CONFIG_ISA) || defined(CONFIG_ATARI_ROM_ISA)
 
 #if MULTI_ISA == 0
 #undef MULTI_ISA
 #endif
 
-#define ISA_TYPE_Q40 (1)
-#define ISA_TYPE_AG  (2)
+#define ISA_TYPE_Q40  (1)
+#define ISA_TYPE_AG   (2)
+#define ISA_TYPE_ENEC (3)
 
 #if defined(CONFIG_Q40) && !defined(MULTI_ISA)
 #define ISA_TYPE ISA_TYPE_Q40
@@ -128,6 +146,10 @@ void mcf_pci_outsl(u32 addr, const u32 *buf, u32 len);
 #define ISA_TYPE ISA_TYPE_AG
 #define ISA_SEX  1
 #endif
+#if defined(CONFIG_ATARI_ROM_ISA) && !defined(MULTI_ISA)
+#define ISA_TYPE ISA_TYPE_ENEC
+#define ISA_SEX  0
+#endif
 
 #ifdef MULTI_ISA
 extern int isa_type;
@@ -152,6 +174,9 @@ static inline u8 __iomem *isa_itb(unsigned long addr)
 #ifdef CONFIG_AMIGA_PCMCIA
     case ISA_TYPE_AG: return (u8 __iomem *)AG_ISA_IO_B(addr);
 #endif
+#ifdef CONFIG_ATARI_ROM_ISA
+    case ISA_TYPE_ENEC: return (u8 __iomem *)ENEC_ISA_IO_B(addr);
+#endif
     default: return NULL; /* avoid warnings, just in case */
     }
 }
@@ -165,6 +190,9 @@ static inline u16 __iomem *isa_itw(unsigned long addr)
 #ifdef CONFIG_AMIGA_PCMCIA
     case ISA_TYPE_AG: return (u16 __iomem *)AG_ISA_IO_W(addr);
 #endif
+#ifdef CONFIG_ATARI_ROM_ISA
+    case ISA_TYPE_ENEC: return (u16 __iomem *)ENEC_ISA_IO_W(addr);
+#endif
     default: return NULL; /* avoid warnings, just in case */
     }
 }
@@ -188,6 +216,9 @@ static inline u8 __iomem *isa_mtb(unsigned long addr)
 #ifdef CONFIG_AMIGA_PCMCIA
     case ISA_TYPE_AG: return (u8 __iomem *)addr;
 #endif
+#ifdef CONFIG_ATARI_ROM_ISA
+    case ISA_TYPE_ENEC: return (u8 __iomem *)ENEC_ISA_MEM_B(addr);
+#endif
     default: return NULL; /* avoid warnings, just in case */
     }
 }
@@ -201,6 +232,9 @@ static inline u16 __iomem *isa_mtw(unsigned long addr)
 #ifdef CONFIG_AMIGA_PCMCIA
     case ISA_TYPE_AG: return (u16 __iomem *)addr;
 #endif
+#ifdef CONFIG_ATARI_ROM_ISA
+    case ISA_TYPE_ENEC: return (u16 __iomem *)ENEC_ISA_MEM_W(addr);
+#endif
     default: return NULL; /* avoid warnings, just in case */
     }
 }
@@ -222,6 +256,36 @@ static inline u16 __iomem *isa_mtw(unsigned long addr)
         (ISA_SEX ? out_be16(isa_mtw((unsigned long)(p)),(val))  \
                  : out_le16(isa_mtw((unsigned long)(p)),(val)))
 
+#ifdef CONFIG_ATARI_ROM_ISA
+#define isa_rom_inb(port)      rom_in_8(isa_itb(port))
+#define isa_rom_inw(port)       \
+        (ISA_SEX ? rom_in_be16(isa_itw(port))   \
+                 : rom_in_le16(isa_itw(port)))
+
+#define isa_rom_outb(val, port) rom_out_8(isa_itb(port), (val))
+#define isa_rom_outw(val, port) \
+        (ISA_SEX ? rom_out_be16(isa_itw(port), (val))   \
+                 : rom_out_le16(isa_itw(port), (val)))
+
+#define isa_rom_readb(p)       rom_in_8(isa_mtb((unsigned long)(p)))
+#define isa_rom_readw(p)       \
+        (ISA_SEX ? rom_in_be16(isa_mtw((unsigned long)(p)))     \
+                 : rom_in_le16(isa_mtw((unsigned long)(p))))
+#define isa_rom_readw_swap(p)       \
+        (ISA_SEX ? rom_in_le16(isa_mtw((unsigned long)(p)))     \
+                 : rom_in_be16(isa_mtw((unsigned long)(p))))
+#define isa_rom_readw_raw(p)   rom_in_be16(isa_mtw((unsigned long)(p)))
+
+#define isa_rom_writeb(val, p)  rom_out_8(isa_mtb((unsigned long)(p)), (val))
+#define isa_rom_writew(val, p)  \
+        (ISA_SEX ? rom_out_be16(isa_mtw((unsigned long)(p)), (val))     \
+                 : rom_out_le16(isa_mtw((unsigned long)(p)), (val)))
+#define isa_rom_writew_swap(val, p)  \
+        (ISA_SEX ? rom_out_le16(isa_mtw((unsigned long)(p)), (val))     \
+                 : rom_out_be16(isa_mtw((unsigned long)(p)), (val)))
+#define isa_rom_writew_raw(val, p)  rom_out_be16(isa_mtw((unsigned long)(p)), (val))
+#endif /* CONFIG_ATARI_ROM_ISA */
+
 static inline void isa_delay(void)
 {
   switch(ISA_TYPE)
@@ -232,6 +296,9 @@ static inline void isa_delay(void)
 #ifdef CONFIG_AMIGA_PCMCIA
     case ISA_TYPE_AG: break;
 #endif
+#ifdef CONFIG_ATARI_ROM_ISA
+    case ISA_TYPE_ENEC: break;
+#endif
     default: break; /* avoid warnings */
     }
 }
@@ -263,6 +330,29 @@ static inline void isa_delay(void)
                   raw_outsw_swapw(isa_itw(port), (u16 *)(buf), (nr)<<1))
 
 
+#ifdef CONFIG_ATARI_ROM_ISA
+#define isa_rom_inb_p(p)        ({ u8 _v = isa_rom_inb(p); isa_delay(); _v; })
+#define isa_rom_inw_p(p)        ({ u16 _v = isa_rom_inw(p); isa_delay(); _v; })
+#define isa_rom_outb_p(v, p)    ({ isa_rom_outb((v), (p)); isa_delay(); })
+#define isa_rom_outw_p(v, p)    ({ isa_rom_outw((v), (p)); isa_delay(); })
+
+#define isa_rom_insb(port, buf, nr) raw_rom_insb(isa_itb(port), (u8 *)(buf), (nr))
+
+#define isa_rom_insw(port, buf, nr)     \
+       (ISA_SEX ? raw_rom_insw(isa_itw(port), (u16 *)(buf), (nr)) :    \
+                  raw_rom_insw_swapw(isa_itw(port), (u16 *)(buf), (nr)))
+
+#define isa_rom_outsb(port, buf, nr) raw_rom_outsb(isa_itb(port), (u8 *)(buf), (nr))
+
+#define isa_rom_outsw(port, buf, nr)    \
+       (ISA_SEX ? raw_rom_outsw(isa_itw(port), (u16 *)(buf), (nr)) :  \
+                  raw_rom_outsw_swapw(isa_itw(port), (u16 *)(buf), (nr)))
+#endif /* CONFIG_ATARI_ROM_ISA */
+
+#endif  /* CONFIG_ISA || CONFIG_ATARI_ROM_ISA */
+
+
+#if defined(CONFIG_ISA) && !defined(CONFIG_ATARI_ROM_ISA)
 #define inb     isa_inb
 #define inb_p   isa_inb_p
 #define outb    isa_outb
@@ -285,9 +375,43 @@ static inline void isa_delay(void)
 #define readw   isa_readw
 #define writeb  isa_writeb
 #define writew  isa_writew
+#endif  /* CONFIG_ISA && !CONFIG_ATARI_ROM_ISA */
 
-#else  /* CONFIG_ISA */
-
+#ifdef CONFIG_ATARI_ROM_ISA
+/*
+ * kernel with both ROM port ISA and IDE compiled in, those have
+ * conflicting defs for in/out. Simply consider port < 1024
+ * ROM port ISA and everything else regular ISA for IDE. read,write defined
+ * below.
+ */
+#define inb(port)       ((port) < 1024 ? isa_rom_inb(port) : in_8(port))
+#define inb_p(port)     ((port) < 1024 ? isa_rom_inb_p(port) : in_8(port))
+#define inw(port)       ((port) < 1024 ? isa_rom_inw(port) : in_le16(port))
+#define inw_p(port)     ((port) < 1024 ? isa_rom_inw_p(port) : in_le16(port))
+#define inl             isa_inl
+#define inl_p           isa_inl_p
+
+#define outb(val, port) ((port) < 1024 ? isa_rom_outb((val), (port)) : out_8((port), (val)))
+#define outb_p(val, port) ((port) < 1024 ? isa_rom_outb_p((val), (port)) : out_8((port), (val)))
+#define outw(val, port) ((port) < 1024 ? isa_rom_outw((val), (port)) : out_le16((port), (val)))
+#define outw_p(val, port) ((port) < 1024 ? isa_rom_outw_p((val), (port)) : out_le16((port), (val)))
+#define outl            isa_outl
+#define outl_p          isa_outl_p
+
+#define insb(port, buf, nr)     ((port) < 1024 ? isa_rom_insb((port), (buf), (nr)) : isa_insb((port), (buf), (nr)))
+#define insw(port, buf, nr)     ((port) < 1024 ? isa_rom_insw((port), (buf), (nr)) : isa_insw((port), (buf), (nr)))
+#define insl                    isa_insl
+#define outsb(port, buf, nr)    ((port) < 1024 ? isa_rom_outsb((port), (buf), (nr)) : isa_outsb((port), (buf), (nr)))
+#define outsw(port, buf, nr)    ((port) < 1024 ? isa_rom_outsw((port), (buf), (nr)) : isa_outsw((port), (buf), (nr)))
+#define outsl                   isa_outsl
+
+#define readb(addr)             in_8(addr)
+#define writeb(val, addr)       out_8((addr), (val))
+#define readw(addr)             in_le16(addr)
+#define writew(val, addr)       out_le16((addr), (val))
+#endif /* CONFIG_ATARI_ROM_ISA */
+
+#if !defined(CONFIG_ISA) && !defined(CONFIG_ATARI_ROM_ISA)
 /*
  * We need to define dummy functions for GENERIC_IOMAP support.
  */
@@ -319,7 +443,7 @@ static inline void isa_delay(void)
 #define readw(addr)      in_le16(addr)
 #define writew(val,addr) out_le16((addr),(val))
 
-#endif /* CONFIG_ISA */
+#endif /* !CONFIG_ISA && !CONFIG_ATARI_ROM_ISA */
 
 #define readl(addr)      in_le32(addr)
 #define writel(val,addr) out_le32((addr),(val))
diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h
index c1155f0e22cc..81ca118d58af 100644
--- a/arch/m68k/include/asm/irq.h
+++ b/arch/m68k/include/asm/irq.h
@@ -6,12 +6,16 @@
  * different m68k hosts compiled into the kernel.
  * Currently the Atari has 72 and the Amiga 24, but if both are
  * supported in the kernel it is better to make room for 72.
+ * With EtherNAT add-on card on Atari, the highest interrupt
+ * number is 140 so NR_IRQS needs to be 141.
  */
 #if defined(CONFIG_COLDFIRE)
 #define NR_IRQS 256
 #elif defined(CONFIG_VME) || defined(CONFIG_SUN3) || defined(CONFIG_SUN3X)
 #define NR_IRQS 200
-#elif defined(CONFIG_ATARI) || defined(CONFIG_MAC)
+#elif defined(CONFIG_ATARI)
+#define NR_IRQS 141
+#elif defined(CONFIG_MAC)
 #define NR_IRQS 72
 #elif defined(CONFIG_Q40)
 #define NR_IRQS 43
diff --git a/arch/m68k/include/asm/raw_io.h b/arch/m68k/include/asm/raw_io.h
index d9eb9834ccc8..932faa35655b 100644
--- a/arch/m68k/include/asm/raw_io.h
+++ b/arch/m68k/include/asm/raw_io.h
@@ -10,7 +10,7 @@
 
 #ifdef __KERNEL__
 
-#include <asm/types.h>
+#include <asm/byteorder.h>
 
 
 /* Values for nocacheflag and cmode */
@@ -60,6 +60,57 @@ extern void __iounmap(void *addr, unsigned long size);
 #define __raw_writew(val,addr) out_be16((addr),(val))
 #define __raw_writel(val,addr) out_be32((addr),(val))
 
+/*
+ * Atari ROM port (cartridge port) ISA adapter, used for the EtherNEC NE2000
+ * network card driver.
+ * The ISA adapter connects address lines A9-A13 to ISA address lines A0-A4,
+ * and hardwires the rest of the ISA addresses for a base address of 0x300.
+ *
+ * Data lines D8-D15 are connected to ISA data lines D0-D7 for reading.
+ * For writes, address lines A1-A8 are latched to ISA data lines D0-D7
+ * (meaning the bit pattern on A1-A8 can be read back as byte).
+ *
+ * Read and write operations are distinguished by the base address used:
+ * reads are from the ROM A side range, writes are through the B side range
+ * addresses (A side base + 0x10000).
+ *
+ * Reads and writes are byte only.
+ *
+ * 16 bit reads and writes are necessary for the NetUSBee adapter's USB
+ * chipset - 16 bit words are read straight off the ROM port while 16 bit
+ * reads are split into two byte writes. The low byte is latched to the
+ * NetUSBee buffer by a read from the _read_ window (with the data pattern
+ * asserted as A1-A8 address pattern). The high byte is then written to the
+ * write range as usual, completing the write cycle.
+ */
+
+#if defined(CONFIG_ATARI_ROM_ISA)
+#define rom_in_8(addr) \
+        ({ u16 __v = (*(__force volatile u16 *) (addr)); __v >>= 8; __v; })
+#define rom_in_be16(addr) \
+        ({ u16 __v = (*(__force volatile u16 *) (addr)); __v; })
+#define rom_in_le16(addr) \
+        ({ u16 __v = le16_to_cpu(*(__force volatile u16 *) (addr)); __v; })
+
+#define rom_out_8(addr, b)      \
+        ({u8 __w, __v = (b);  u32 _addr = ((u32) (addr)); \
+        __w = ((*(__force volatile u8 *)  ((_addr | 0x10000) + (__v<<1)))); })
+#define rom_out_be16(addr, w)   \
+        ({u16 __w, __v = (w); u32 _addr = ((u32) (addr)); \
+        __w = ((*(__force volatile u16 *) ((_addr & 0xFFFF0000UL) + ((__v & 0xFF)<<1)))); \
+        __w = ((*(__force volatile u16 *) ((_addr | 0x10000) + ((__v >> 8)<<1)))); })
+#define rom_out_le16(addr, w)   \
+        ({u16 __w, __v = (w); u32 _addr = ((u32) (addr)); \
+        __w = ((*(__force volatile u16 *) ((_addr & 0xFFFF0000UL) + ((__v >> 8)<<1)))); \
+        __w = ((*(__force volatile u16 *) ((_addr | 0x10000) + ((__v & 0xFF)<<1)))); })
+
+#define raw_rom_inb rom_in_8
+#define raw_rom_inw rom_in_be16
+
+#define raw_rom_outb(val, port) rom_out_8((port), (val))
+#define raw_rom_outw(val, port) rom_out_be16((port), (val))
+#endif /* CONFIG_ATARI_ROM_ISA */
+
 static inline void raw_insb(volatile u8 __iomem *port, u8 *buf, unsigned int len)
 {
         unsigned int i;
@@ -342,6 +393,62 @@ static inline void raw_outsw_swapw(volatile u16 __iomem *port, const u16 *buf,
                 : "d0", "a0", "a1", "d6");
 }
 
+
+#if defined(CONFIG_ATARI_ROM_ISA)
+static inline void raw_rom_insb(volatile u8 __iomem *port, u8 *buf, unsigned int len)
+{
+        unsigned int i;
+
+        for (i = 0; i < len; i++)
+                *buf++ = rom_in_8(port);
+}
+
+static inline void raw_rom_outsb(volatile u8 __iomem *port, const u8 *buf,
+                             unsigned int len)
+{
+        unsigned int i;
+
+        for (i = 0; i < len; i++)
+                rom_out_8(port, *buf++);
+}
+
+static inline void raw_rom_insw(volatile u16 __iomem *port, u16 *buf,
+                                   unsigned int nr)
+{
+        unsigned int i;
+
+        for (i = 0; i < nr; i++)
+                *buf++ = rom_in_be16(port);
+}
+
+static inline void raw_rom_outsw(volatile u16 __iomem *port, const u16 *buf,
+                                   unsigned int nr)
+{
+        unsigned int i;
+
+        for (i = 0; i < nr; i++)
+                rom_out_be16(port, *buf++);
+}
+
+static inline void raw_rom_insw_swapw(volatile u16 __iomem *port, u16 *buf,
+                                   unsigned int nr)
+{
+        unsigned int i;
+
+        for (i = 0; i < nr; i++)
+                *buf++ = rom_in_le16(port);
+}
+
+static inline void raw_rom_outsw_swapw(volatile u16 __iomem *port, const u16 *buf,
+                                   unsigned int nr)
+{
+        unsigned int i;
+
+        for (i = 0; i < nr; i++)
+                rom_out_le16(port, *buf++);
+}
+#endif /* CONFIG_ATARI_ROM_ISA */
+
 #endif /* __KERNEL__ */
 
 #endif /* _RAW_IO_H */
diff --git a/arch/m68k/include/asm/string.h b/arch/m68k/include/asm/string.h
index 32198454da70..9aea9f11fa25 100644
--- a/arch/m68k/include/asm/string.h
+++ b/arch/m68k/include/asm/string.h
@@ -4,15 +4,6 @@
 #include <linux/types.h>
 #include <linux/compiler.h>
 
-static inline size_t __kernel_strlen(const char *s)
-{
-        const char *sc;
-
-        for (sc = s; *sc++; )
-                ;
-        return sc - s - 1;
-}
-
 static inline char *__kernel_strcpy(char *dest, const char *src)
 {
         char *xdest = dest;
@@ -27,11 +18,6 @@ static inline char *__kernel_strcpy(char *dest, const char *src)
 
 #ifndef __IN_STRING_C
 
-#define __HAVE_ARCH_STRLEN
-#define strlen(s)       (__builtin_constant_p(s) ?      \
-                         __builtin_strlen(s) :          \
-                         __kernel_strlen(s))
-
 #define __HAVE_ARCH_STRNLEN
 static inline size_t strnlen(const char *s, size_t count)
 {
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index 80cfbe56ea32..e67e53159573 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -381,6 +381,12 @@ void __init setup_arch(char **cmdline_p)
                 isa_sex = 1;
         }
 #endif
+#ifdef CONFIG_ATARI_ROM_ISA
+        if (MACH_IS_ATARI) {
+                isa_type = ISA_TYPE_ENEC;
+                isa_sex = 0;
+        }
+#endif
 #endif
 }
 
diff --git a/arch/m68k/lib/string.c b/arch/m68k/lib/string.c
index b9a57abfad08..4d61fa8a112c 100644
--- a/arch/m68k/lib/string.c
+++ b/arch/m68k/lib/string.c
@@ -17,6 +17,6 @@ EXPORT_SYMBOL(strcpy);
 
 char *strcat(char *dest, const char *src)
 {
-        return __kernel_strcpy(dest + __kernel_strlen(dest), src);
+        return __kernel_strcpy(dest + strlen(dest), src);
 }
 EXPORT_SYMBOL(strcat);