m68k/atari: EtherNAT - platform device and IRQ support code

Add platform device and interrupt definitions necessary for the EtherNAT
Ethernet/USB adapter for the Falcon extension port. EtherNAT interrupt
numbers are 139/140 so the max. interrupt number for Atari has to be
increased.

[Geert] Conditionalize platform device data structures

Signed-off-by: Michael Schmitz <schmitz@debian.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices
index 4bc945dfe467ba8fd746eb5de9d595f8c172c3d8..d50ecbf6d64fe311f1fbed2ea8d0e61b14ff2bd1 100644 (file)
--- a/arch/m68k/Kconfig.devices
+++ b/arch/m68k/Kconfig.devices
@@ -55,6 +55,16 @@ 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.
+
 endmenu
 
 menu "Character devices"

diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c
index 037c11c993315a5dc730c9dc19f10be89072b4ab..49d1c750acb05f7f397201b1de4235fb236092ee 100644 (file)
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
@@ -31,6 +31,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
+#include <linux/platform_device.h>
 #include <linux/vt_kern.h>
 #include <linux/module.h>
 
@@ -655,3 +656,66 @@ 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 driver
+ */
+
+#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,
+};
+
+static struct platform_device *atari_ethernat_devices[] __initdata = {
+       &smc91x_device
+};
+#endif /* CONFIG_ATARI_ETHERNAT */
+
+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
+
+       return rv;
+}
+
+arch_initcall(atari_platform_init);

diff --git a/arch/m68k/include/asm/atarihw.h b/arch/m68k/include/asm/atarihw.h
index c0cb363507754af5028d284d9cd89f39fffeb699..d887050e6da6438516f0884c78ed9eb9889e2eda 100644 (file)
--- 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 8f71504956cda2a343693f0c65562fb26f3ea625..953e0ac6855eed9e3e94846c601257a2ed98493f 100644 (file)
--- 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)))

diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h
index c1155f0e22cc2615a0e97f5745dd3c5d7d77aba9..81ca118d58af90da793a8038225c6ec605c2d63a 100644 (file)
--- 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