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

Pull m68k updates from Geert Uytterhoeven:
 - Zorro bus cleanups and UAPI revival
 - Bootinfo cleanups and UAPI revival
 - Kexec support
 - Memory size reductions and bug fixes for multi-platform kernels
 - Polled interrupt support for Atari EtherNAT, EtherNEC and NetUSBee
 - Machine-specific random_get_entropy()
 - Defconfig updates and cleanups

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (46 commits)
  m68k/mac: Make SCC reset work more reliably
  m68k/irq - Use polled IRQ flag for MFP timer cascaded interrupts
  m68k: Update defconfigs for v3.13-rc1
  m68k/defconfig: Enable EARLY_PRINTK
  m68k/mm: kmap spelling/grammar fixes
  m68k: Convert arch/m68k/kernel/traps.c to pr_*()
  m68k: Convert arch/m68k/mm/fault.c to pr_*()
  m68k/mm: Check for mm != NULL in do_page_fault() debug code
  m68k/defconfig: Disable /sbin/hotplug fork-bomb by default
  m68k/atari: Hide RTC_PORT() macro from rtc-cmos
  m68k/amiga,atari: Fix specifying multiple debug= parameters
  m68k/defconfig: Use ext4 for ext2/ext3 file systems
  m68k: Add support to export bootinfo in procfs
  m68k: Add kexec support
  m68k/mac: Mark Mac IIsi ADB driver BROKEN
  m68k/amiga: Provide mach_random_get_entropy()
  m68k: Add infrastructure for machine-specific random_get_entropy()
  m68k/atari: Call paging_init() before nf_init()
  m68k: Remove superfluous inclusions of <asm/bootinfo.h>
  m68k/UAPI: Use proper types (endianness/size) in <asm/bootinfo*.h>
  ...

25 files changed, 89 insertions, 64 deletions

diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index 5a95baf4b104..27de5046708a 100644
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -43,9 +43,6 @@
 #include <linux/zorro.h>
 
 
-extern int m68k_realnum_memory;
-extern struct mem_info m68k_memory[NUM_MEMINFO];
-
 #define Z2MINOR_COMBINED      (0)
 #define Z2MINOR_Z2ONLY        (1)
 #define Z2MINOR_CHIPONLY      (2)
@@ -116,8 +113,8 @@ get_z2ram( void )
         if ( test_bit( i, zorro_unused_z2ram ) )
         {
             z2_count++;
-            z2ram_map[ z2ram_size++ ] = 
-                ZTWO_VADDR( Z2RAM_START ) + ( i << Z2RAM_CHUNKSHIFT );
+            z2ram_map[z2ram_size++] = (unsigned long)ZTWO_VADDR(Z2RAM_START) +
+                                      (i << Z2RAM_CHUNKSHIFT);
             clear_bit( i, zorro_unused_z2ram );
         }
     }
diff --git a/drivers/ide/buddha.c b/drivers/ide/buddha.c
index b1d38590ac01..46eaf58d881b 100644
--- a/drivers/ide/buddha.c
+++ b/drivers/ide/buddha.c
@@ -198,7 +198,7 @@ fail_base2:
                                 continue;
                         }
                 }         
-                buddha_board = ZTWO_VADDR(board);
+                buddha_board = (unsigned long)ZTWO_VADDR(board);
                 
                 /* write to BUDDHA_IRQ_MR to enable the board IRQ */
                 /* X-Surf doesn't have this.  IRQs are always on */
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index d26a312f117a..3067d56b11a6 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -32,7 +32,7 @@ config ADB_MACII
 
 config ADB_MACIISI
         bool "Include Mac IIsi ADB driver"
-        depends on ADB && MAC
+        depends on ADB && MAC && BROKEN
         help
           Say Y here if want your kernel to support Macintosh systems that use
           the Mac IIsi style ADB.  This includes the IIsi, IIvi, IIvx, Classic
diff --git a/drivers/net/ethernet/8390/hydra.c b/drivers/net/ethernet/8390/hydra.c
index fb3dd4399cf3..f615fdec0f1b 100644
--- a/drivers/net/ethernet/8390/hydra.c
+++ b/drivers/net/ethernet/8390/hydra.c
@@ -113,7 +113,7 @@ static const struct net_device_ops hydra_netdev_ops = {
 static int hydra_init(struct zorro_dev *z)
 {
     struct net_device *dev;
-    unsigned long board = ZTWO_VADDR(z->resource.start);
+    unsigned long board = (unsigned long)ZTWO_VADDR(z->resource.start);
     unsigned long ioaddr = board+HYDRA_NIC_BASE;
     const char name[] = "NE2000";
     int start_page, stop_page;
diff --git a/drivers/net/ethernet/8390/zorro8390.c b/drivers/net/ethernet/8390/zorro8390.c
index 85ec4c2d2645..ae2a12b7db62 100644
--- a/drivers/net/ethernet/8390/zorro8390.c
+++ b/drivers/net/ethernet/8390/zorro8390.c
@@ -287,7 +287,7 @@ static const struct net_device_ops zorro8390_netdev_ops = {
 };
 
 static int zorro8390_init(struct net_device *dev, unsigned long board,
-                          const char *name, unsigned long ioaddr)
+                          const char *name, void __iomem *ioaddr)
 {
         int i;
         int err;
@@ -354,7 +354,7 @@ static int zorro8390_init(struct net_device *dev, unsigned long board,
         start_page = NESM_START_PG;
         stop_page = NESM_STOP_PG;
 
-        dev->base_addr = ioaddr;
+        dev->base_addr = (unsigned long)ioaddr;
         dev->irq = IRQ_AMIGA_PORTS;
 
         /* Install the Interrupt handler */
diff --git a/drivers/net/ethernet/amd/a2065.c b/drivers/net/ethernet/amd/a2065.c
index 0866e7627433..56139184b801 100644
--- a/drivers/net/ethernet/amd/a2065.c
+++ b/drivers/net/ethernet/amd/a2065.c
@@ -57,6 +57,7 @@
 #include <linux/zorro.h>
 #include <linux/bitops.h>
 
+#include <asm/byteorder.h>
 #include <asm/irq.h>
 #include <asm/amigaints.h>
 #include <asm/amigahw.h>
@@ -678,6 +679,7 @@ static int a2065_init_one(struct zorro_dev *z,
         unsigned long base_addr = board + A2065_LANCE;
         unsigned long mem_start = board + A2065_RAM;
         struct resource *r1, *r2;
+        u32 serial;
         int err;
 
         r1 = request_mem_region(base_addr, sizeof(struct lance_regs),
@@ -702,6 +704,7 @@ static int a2065_init_one(struct zorro_dev *z,
         r1->name = dev->name;
         r2->name = dev->name;
 
+        serial = be32_to_cpu(z->rom.er_SerialNumber);
         dev->dev_addr[0] = 0x00;
         if (z->id != ZORRO_PROD_AMERISTAR_A2065) {      /* Commodore */
                 dev->dev_addr[1] = 0x80;
@@ -710,11 +713,11 @@ static int a2065_init_one(struct zorro_dev *z,
                 dev->dev_addr[1] = 0x00;
                 dev->dev_addr[2] = 0x9f;
         }
-        dev->dev_addr[3] = (z->rom.er_SerialNumber >> 16) & 0xff;
-        dev->dev_addr[4] = (z->rom.er_SerialNumber >> 8) & 0xff;
-        dev->dev_addr[5] = z->rom.er_SerialNumber & 0xff;
-        dev->base_addr = ZTWO_VADDR(base_addr);
-        dev->mem_start = ZTWO_VADDR(mem_start);
+        dev->dev_addr[3] = (serial >> 16) & 0xff;
+        dev->dev_addr[4] = (serial >> 8) & 0xff;
+        dev->dev_addr[5] = serial & 0xff;
+        dev->base_addr = (unsigned long)ZTWO_VADDR(base_addr);
+        dev->mem_start = (unsigned long)ZTWO_VADDR(mem_start);
         dev->mem_end = dev->mem_start + A2065_RAM_SIZE;
 
         priv->ll = (volatile struct lance_regs *)dev->base_addr;
diff --git a/drivers/net/ethernet/amd/ariadne.c b/drivers/net/ethernet/amd/ariadne.c
index c178eb4c8166..b08101b31b8b 100644
--- a/drivers/net/ethernet/amd/ariadne.c
+++ b/drivers/net/ethernet/amd/ariadne.c
@@ -51,6 +51,7 @@
 #include <linux/zorro.h>
 #include <linux/bitops.h>
 
+#include <asm/byteorder.h>
 #include <asm/amigaints.h>
 #include <asm/amigahw.h>
 #include <asm/irq.h>
@@ -718,6 +719,7 @@ static int ariadne_init_one(struct zorro_dev *z,
         struct resource *r1, *r2;
         struct net_device *dev;
         struct ariadne_private *priv;
+        u32 serial;
         int err;
 
         r1 = request_mem_region(base_addr, sizeof(struct Am79C960), "Am79C960");
@@ -741,14 +743,15 @@ static int ariadne_init_one(struct zorro_dev *z,
         r1->name = dev->name;
         r2->name = dev->name;
 
+        serial = be32_to_cpu(z->rom.er_SerialNumber);
         dev->dev_addr[0] = 0x00;
         dev->dev_addr[1] = 0x60;
         dev->dev_addr[2] = 0x30;
-        dev->dev_addr[3] = (z->rom.er_SerialNumber >> 16) & 0xff;
-        dev->dev_addr[4] = (z->rom.er_SerialNumber >> 8) & 0xff;
-        dev->dev_addr[5] = z->rom.er_SerialNumber & 0xff;
-        dev->base_addr = ZTWO_VADDR(base_addr);
-        dev->mem_start = ZTWO_VADDR(mem_start);
+        dev->dev_addr[3] = (serial >> 16) & 0xff;
+        dev->dev_addr[4] = (serial >> 8) & 0xff;
+        dev->dev_addr[5] = serial & 0xff;
+        dev->base_addr = (unsigned long)ZTWO_VADDR(base_addr);
+        dev->mem_start = (unsigned long)ZTWO_VADDR(mem_start);
         dev->mem_end = dev->mem_start + ARIADNE_RAM_SIZE;
 
         dev->netdev_ops = &ariadne_netdev_ops;
diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c
index 346a4e025c34..04b3ec1352f1 100644
--- a/drivers/net/ethernet/natsemi/macsonic.c
+++ b/drivers/net/ethernet/natsemi/macsonic.c
@@ -52,7 +52,6 @@
 #include <linux/bitrev.h>
 #include <linux/slab.h>
 
-#include <asm/bootinfo.h>
 #include <asm/pgtable.h>
 #include <asm/io.h>
 #include <asm/hwtest.h>
diff --git a/drivers/parport/parport_mfc3.c b/drivers/parport/parport_mfc3.c
index 7578d79b3688..2f650f68af14 100644
--- a/drivers/parport/parport_mfc3.c
+++ b/drivers/parport/parport_mfc3.c
@@ -300,7 +300,7 @@ static int __init parport_mfc3_init(void)
                 if (!request_mem_region(piabase, sizeof(struct pia), "PIA"))
                         continue;
 
-                pp = (struct pia *)ZTWO_VADDR(piabase);
+                pp = ZTWO_VADDR(piabase);
                 pp->crb = 0;
                 pp->pddrb = 255; /* all data pins output */
                 pp->crb = PIA_DDR|32|8;
diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index 30fa38a0ad39..9176bfbd5745 100644
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -201,7 +201,7 @@ static int a2091_probe(struct zorro_dev *z, const struct zorro_device_id *ent)
         instance->irq = IRQ_AMIGA_PORTS;
         instance->unique_id = z->slotaddr;
 
-        regs = (struct a2091_scsiregs *)ZTWO_VADDR(z->resource.start);
+        regs = ZTWO_VADDR(z->resource.start);
         regs->DAWR = DAWR_A2091;
 
         wdregs.SASR = &regs->SASR;
diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c
index c0f4f4290dd6..dd5b64726ddc 100644
--- a/drivers/scsi/a3000.c
+++ b/drivers/scsi/a3000.c
@@ -220,7 +220,7 @@ static int __init amiga_a3000_scsi_probe(struct platform_device *pdev)
 
         instance->irq = IRQ_AMIGA_PORTS;
 
-        regs = (struct a3000_scsiregs *)ZTWO_VADDR(res->start);
+        regs = ZTWO_VADDR(res->start);
         regs->DAWR = DAWR_A3000;
 
         wdregs.SASR = &regs->SASR;
diff --git a/drivers/scsi/a4000t.c b/drivers/scsi/a4000t.c
index 70c521f79f7c..f5a2ab41543b 100644
--- a/drivers/scsi/a4000t.c
+++ b/drivers/scsi/a4000t.c
@@ -56,7 +56,7 @@ static int __init amiga_a4000t_scsi_probe(struct platform_device *pdev)
         scsi_addr = res->start + A4000T_SCSI_OFFSET;
 
         /* Fill in the required pieces of hostdata */
-        hostdata->base = (void __iomem *)ZTWO_VADDR(scsi_addr);
+        hostdata->base = ZTWO_VADDR(scsi_addr);
         hostdata->clock = 50;
         hostdata->chip710 = 1;
         hostdata->dmode_extra = DMODE_FC2;
diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c
index 2203ac281103..3b6f83ffddc4 100644
--- a/drivers/scsi/gvp11.c
+++ b/drivers/scsi/gvp11.c
@@ -310,7 +310,7 @@ static int gvp11_probe(struct zorro_dev *z, const struct zorro_device_id *ent)
         if (!request_mem_region(address, 256, "wd33c93"))
                 return -EBUSY;
 
-        regs = (struct gvp11_scsiregs *)(ZTWO_VADDR(address));
+        regs = ZTWO_VADDR(address);
 
         error = check_wd33c93(regs);
         if (error)
diff --git a/drivers/scsi/zorro7xx.c b/drivers/scsi/zorro7xx.c
index cbf3476c68cd..aff31991aea9 100644
--- a/drivers/scsi/zorro7xx.c
+++ b/drivers/scsi/zorro7xx.c
@@ -104,7 +104,7 @@ static int zorro7xx_init_one(struct zorro_dev *z,
         if (ioaddr > 0x01000000)
                 hostdata->base = ioremap(ioaddr, zorro_resource_len(z));
         else
-                hostdata->base = (void __iomem *)ZTWO_VADDR(ioaddr);
+                hostdata->base = ZTWO_VADDR(ioaddr);
 
         hostdata->clock = 50;
         hostdata->chip710 = 1;
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 0dac36ce09d6..518f790ef88a 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -3710,7 +3710,7 @@ default_chipset:
         if (!videomemory) {
                 dev_warn(&pdev->dev,
                          "Unable to map videomem cached writethrough\n");
-                info->screen_base = (char *)ZTWO_VADDR(info->fix.smem_start);
+                info->screen_base = ZTWO_VADDR(info->fix.smem_start);
         } else
                 info->screen_base = (char *)videomemory;
 
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 5aab9b9dc210..d992aa5eb3f0 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -2256,7 +2256,7 @@ static int cirrusfb_zorro_register(struct zorro_dev *z,
 
         info->fix.mmio_start = regbase;
         cinfo->regbase = regbase > 16 * MB_ ? ioremap(regbase, 64 * 1024)
-                                            : (caddr_t)ZTWO_VADDR(regbase);
+                                            : ZTWO_VADDR(regbase);
         if (!cinfo->regbase) {
                 dev_err(info->device, "Cannot map registers\n");
                 error = -EIO;
@@ -2266,7 +2266,7 @@ static int cirrusfb_zorro_register(struct zorro_dev *z,
         info->fix.smem_start = rambase;
         info->screen_size = ramsize;
         info->screen_base = rambase > 16 * MB_ ? ioremap(rambase, ramsize)
-                                               : (caddr_t)ZTWO_VADDR(rambase);
+                                               : ZTWO_VADDR(rambase);
         if (!info->screen_base) {
                 dev_err(info->device, "Cannot map video RAM\n");
                 error = -EIO;
diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c
index 5bd2eb8d4f39..cda7587cbc86 100644
--- a/drivers/video/macfb.c
+++ b/drivers/video/macfb.c
@@ -34,7 +34,6 @@
 #include <linux/fb.h>
 
 #include <asm/setup.h>
-#include <asm/bootinfo.h>
 #include <asm/macintosh.h>
 #include <asm/io.h>
 
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c
index e287ebc47817..97cb9bd1d1dd 100644
--- a/drivers/video/valkyriefb.c
+++ b/drivers/video/valkyriefb.c
@@ -56,7 +56,6 @@
 #include <linux/cuda.h>
 #include <asm/io.h>
 #ifdef CONFIG_MAC
-#include <asm/bootinfo.h>
 #include <asm/macintosh.h>
 #else
 #include <asm/prom.h>
diff --git a/drivers/zorro/Makefile b/drivers/zorro/Makefile
index f62172603215..7dc5332ff984 100644
--- a/drivers/zorro/Makefile
+++ b/drivers/zorro/Makefile
@@ -2,8 +2,9 @@
 # Makefile for the Zorro bus specific drivers.
 #
 
-obj-$(CONFIG_ZORRO)     += zorro.o zorro-driver.o zorro-sysfs.o names.o
+obj-$(CONFIG_ZORRO)     += zorro.o zorro-driver.o zorro-sysfs.o
 obj-$(CONFIG_PROC_FS)   += proc.o
+obj-$(CONFIG_ZORRO_NAMES) +=  names.o
 
 hostprogs-y             := gen-devlist
 
diff --git a/drivers/zorro/names.c b/drivers/zorro/names.c
index e8517c3d8e82..6f3fd9903ac3 100644
--- a/drivers/zorro/names.c
+++ b/drivers/zorro/names.c
@@ -15,8 +15,6 @@
 #include <linux/zorro.h>
 
 
-#ifdef CONFIG_ZORRO_NAMES
-
 struct zorro_prod_info {
         __u16 prod;
         unsigned short seen;
@@ -69,7 +67,6 @@ void __init zorro_name_device(struct zorro_dev *dev)
         } while (--i);
 
         /* Couldn't find either the manufacturer nor the product */
-        sprintf(name, "Zorro device %08x", dev->id);
         return;
 
         match_manuf: {
@@ -98,11 +95,3 @@ void __init zorro_name_device(struct zorro_dev *dev)
                 }
         }
 }
-
-#else
-
-void __init zorro_name_device(struct zorro_dev *dev)
-{
-}
-
-#endif
diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c
index ea1ce822a8e0..6ac2579da0eb 100644
--- a/drivers/zorro/proc.c
+++ b/drivers/zorro/proc.c
@@ -14,6 +14,8 @@
 #include <linux/seq_file.h>
 #include <linux/init.h>
 #include <linux/export.h>
+
+#include <asm/byteorder.h>
 #include <asm/uaccess.h>
 #include <asm/amigahw.h>
 #include <asm/setup.h>
@@ -41,10 +43,10 @@ proc_bus_zorro_read(struct file *file, char __user *buf, size_t nbytes, loff_t *
         /* Construct a ConfigDev */
         memset(&cd, 0, sizeof(cd));
         cd.cd_Rom = z->rom;
-        cd.cd_SlotAddr = z->slotaddr;
-        cd.cd_SlotSize = z->slotsize;
-        cd.cd_BoardAddr = (void *)zorro_resource_start(z);
-        cd.cd_BoardSize = zorro_resource_len(z);
+        cd.cd_SlotAddr = cpu_to_be16(z->slotaddr);
+        cd.cd_SlotSize = cpu_to_be16(z->slotsize);
+        cd.cd_BoardAddr = cpu_to_be32(zorro_resource_start(z));
+        cd.cd_BoardSize = cpu_to_be32(zorro_resource_len(z));
 
         if (copy_to_user(buf, (void *)&cd + pos, nbytes))
                 return -EFAULT;
diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c
index ac1db7f1bcab..eacae1434b73 100644
--- a/drivers/zorro/zorro-driver.c
+++ b/drivers/zorro/zorro-driver.c
@@ -161,11 +161,12 @@ static int zorro_uevent(struct device *dev, struct kobj_uevent_env *env)
 }
 
 struct bus_type zorro_bus_type = {
-        .name   = "zorro",
-        .match  = zorro_bus_match,
-        .uevent = zorro_uevent,
-        .probe  = zorro_device_probe,
-        .remove = zorro_device_remove,
+        .name     = "zorro",
+        .dev_name = "zorro",
+        .match    = zorro_bus_match,
+        .uevent   = zorro_uevent,
+        .probe    = zorro_device_probe,
+        .remove   = zorro_device_remove,
 };
 EXPORT_SYMBOL(zorro_bus_type);
 
diff --git a/drivers/zorro/zorro-sysfs.c b/drivers/zorro/zorro-sysfs.c
index 26f7184ef9e1..36b210f9b6b2 100644
--- a/drivers/zorro/zorro-sysfs.c
+++ b/drivers/zorro/zorro-sysfs.c
@@ -16,6 +16,8 @@
 #include <linux/stat.h>
 #include <linux/string.h>
 
+#include <asm/byteorder.h>
+
 #include "zorro.h"
 
 
@@ -33,10 +35,20 @@ static DEVICE_ATTR(name, S_IRUGO, show_##name, NULL);
 
 zorro_config_attr(id, id, "0x%08x\n");
 zorro_config_attr(type, rom.er_Type, "0x%02x\n");
-zorro_config_attr(serial, rom.er_SerialNumber, "0x%08x\n");
 zorro_config_attr(slotaddr, slotaddr, "0x%04x\n");
 zorro_config_attr(slotsize, slotsize, "0x%04x\n");
 
+static ssize_t
+show_serial(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct zorro_dev *z;
+
+        z = to_zorro_dev(dev);
+        return sprintf(buf, "0x%08x\n", be32_to_cpu(z->rom.er_SerialNumber));
+}
+
+static DEVICE_ATTR(serial, S_IRUGO, show_serial, NULL);
+
 static ssize_t zorro_show_resource(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct zorro_dev *z = to_zorro_dev(dev);
@@ -60,10 +72,10 @@ static ssize_t zorro_read_config(struct file *filp, struct kobject *kobj,
         /* Construct a ConfigDev */
         memset(&cd, 0, sizeof(cd));
         cd.cd_Rom = z->rom;
-        cd.cd_SlotAddr = z->slotaddr;
-        cd.cd_SlotSize = z->slotsize;
-        cd.cd_BoardAddr = (void *)zorro_resource_start(z);
-        cd.cd_BoardSize = zorro_resource_len(z);
+        cd.cd_SlotAddr = cpu_to_be16(z->slotaddr);
+        cd.cd_SlotSize = cpu_to_be16(z->slotsize);
+        cd.cd_BoardAddr = cpu_to_be32(zorro_resource_start(z));
+        cd.cd_BoardSize = cpu_to_be32(zorro_resource_len(z));
 
         return memory_read_from_buffer(buf, count, &off, &cd, sizeof(cd));
 }
diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c
index 858c9714b2f3..707c1a5a0317 100644
--- a/drivers/zorro/zorro.c
+++ b/drivers/zorro/zorro.c
@@ -18,6 +18,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
+#include <asm/byteorder.h>
 #include <asm/setup.h>
 #include <asm/amigahw.h>
 
@@ -29,7 +30,8 @@
      */
 
 unsigned int zorro_num_autocon;
-struct zorro_dev zorro_autocon[ZORRO_NUM_AUTO];
+struct zorro_dev_init zorro_autocon_init[ZORRO_NUM_AUTO] __initdata;
+struct zorro_dev *zorro_autocon;
 
 
     /*
@@ -38,6 +40,7 @@ struct zorro_dev zorro_autocon[ZORRO_NUM_AUTO];
 
 struct zorro_bus {
         struct device dev;
+        struct zorro_dev devices[0];
 };
 
 
@@ -125,18 +128,22 @@ static struct resource __init *zorro_find_parent_resource(
 static int __init amiga_zorro_probe(struct platform_device *pdev)
 {
         struct zorro_bus *bus;
+        struct zorro_dev_init *zi;
         struct zorro_dev *z;
         struct resource *r;
         unsigned int i;
         int error;
 
         /* Initialize the Zorro bus */
-        bus = kzalloc(sizeof(*bus), GFP_KERNEL);
+        bus = kzalloc(sizeof(*bus) +
+                      zorro_num_autocon * sizeof(bus->devices[0]),
+                      GFP_KERNEL);
         if (!bus)
                 return -ENOMEM;
 
+        zorro_autocon = bus->devices;
         bus->dev.parent = &pdev->dev;
-        dev_set_name(&bus->dev, "zorro");
+        dev_set_name(&bus->dev, zorro_bus_type.name);
         error = device_register(&bus->dev);
         if (error) {
                 pr_err("Zorro: Error registering zorro_bus\n");
@@ -151,15 +158,23 @@ static int __init amiga_zorro_probe(struct platform_device *pdev)
 
         /* First identify all devices ... */
         for (i = 0; i < zorro_num_autocon; i++) {
+                zi = &zorro_autocon_init[i];
                 z = &zorro_autocon[i];
-                z->id = (z->rom.er_Manufacturer<<16) | (z->rom.er_Product<<8);
+
+                z->rom = zi->rom;
+                z->id = (be16_to_cpu(z->rom.er_Manufacturer) << 16) |
+                        (z->rom.er_Product << 8);
                 if (z->id == ZORRO_PROD_GVP_EPC_BASE) {
                         /* GVP quirk */
-                        unsigned long magic = zorro_resource_start(z)+0x8000;
+                        unsigned long magic = zi->boardaddr + 0x8000;
                         z->id |= *(u16 *)ZTWO_VADDR(magic) & GVP_PRODMASK;
                 }
+                z->slotaddr = zi->slotaddr;
+                z->slotsize = zi->slotsize;
                 sprintf(z->name, "Zorro device %08x", z->id);
                 zorro_name_device(z);
+                z->resource.start = zi->boardaddr;
+                z->resource.end = zi->boardaddr + zi->boardsize - 1;
                 z->resource.name = z->name;
                 r = zorro_find_parent_resource(pdev, z);
                 error = request_resource(r, &z->resource);
@@ -167,9 +182,9 @@ static int __init amiga_zorro_probe(struct platform_device *pdev)
                         dev_err(&bus->dev,
                                 "Address space collision on device %s %pR\n",
                                 z->name, &z->resource);
-                dev_set_name(&z->dev, "%02x", i);
                 z->dev.parent = &bus->dev;
                 z->dev.bus = &zorro_bus_type;
+                z->dev.id = i;
         }
 
         /* ... then register them */
diff --git a/drivers/zorro/zorro.h b/drivers/zorro/zorro.h
index b682d5ccd63f..34119fb4e560 100644
--- a/drivers/zorro/zorro.h
+++ b/drivers/zorro/zorro.h
@@ -1,4 +1,9 @@
 
+#ifdef CONFIG_ZORRO_NAMES
 extern void zorro_name_device(struct zorro_dev *z);
+#else
+static inline void zorro_name_device(struct zorro_dev *dev) { }
+#endif
+
 extern int zorro_create_sysfs_dev_files(struct zorro_dev *z);