Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-tc

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-tc:
  [EISA] EISA registration with !CONFIG_EISA
  [TC] pmagb-b-fb: Convert to the driver model
  [TC] dec_esp: Driver model for the PMAZ-A
  [TC] mips: pmag-ba-fb: Convert to the driver model
  [TC] defxx: TURBOchannel support
  [TC] TURBOchannel support for the DECstation
  [TC] MIPS: TURBOchannel resources off-by-one fix
  [TC] MIPS: TURBOchannel update to the driver model

6 files changed, 153 insertions, 128 deletions

diff --git a/include/asm-mips/dec/system.h b/include/asm-mips/dec/system.h
index 78af51fbc797..b2afaccd6831 100644
--- a/include/asm-mips/dec/system.h
+++ b/include/asm-mips/dec/system.h
@@ -3,7 +3,7 @@
  *
  *      Generic DECstation/DECsystem bits.
  *
- *      Copyright (C) 2005  Maciej W. Rozycki
+ *      Copyright (C) 2005, 2006  Maciej W. Rozycki
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -14,5 +14,6 @@
 #define __ASM_DEC_SYSTEM_H
 
 extern unsigned long dec_kn_slot_base, dec_kn_slot_size;
+extern int dec_tc_bus;
 
 #endif /* __ASM_DEC_SYSTEM_H */
diff --git a/include/asm-mips/dec/tc.h b/include/asm-mips/dec/tc.h
deleted file mode 100644
index 9cb51f24d42c..000000000000
--- a/include/asm-mips/dec/tc.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Interface to the TURBOchannel related routines
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (c) 1998 Harald Koerfgen
- */
-#ifndef __ASM_DEC_TC_H
-#define __ASM_DEC_TC_H
-
-/*
- * Search for a TURBOchannel Option Module
- * with a certain name. Returns slot number
- * of the first card not in use or -ENODEV
- * if none found.
- */
-extern int search_tc_card(const char *);
-/*
- * Marks the card in slot as used
- */
-extern void claim_tc_card(int);
-/*
- * Marks the card in slot as free
- */
-extern void release_tc_card(int);
-/*
- * Return base address of card in slot
- */
-extern unsigned long get_tc_base_addr(int);
-/*
- * Return interrupt number of slot
- */
-extern unsigned long get_tc_irq_nr(int);
-/*
- * Return TURBOchannel clock frequency in Hz
- */
-extern unsigned long get_tc_speed(void);
-
-#endif /* __ASM_DEC_TC_H */
diff --git a/include/asm-mips/dec/tcinfo.h b/include/asm-mips/dec/tcinfo.h
deleted file mode 100644
index cc23509ee77a..000000000000
--- a/include/asm-mips/dec/tcinfo.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Various TURBOchannel related stuff
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Information obtained through the get_tcinfo prom call
- * created from:
- *
- * TURBOchannel Firmware Specification
- *
- * EK-TCAAD-FS-004
- * from Digital Equipment Corporation
- *
- * Copyright (c) 1998 Harald Koerfgen
- */
-
-typedef struct {
-        int revision;
-        int clk_period;
-        int slot_size;
-        int io_timeout;
-        int dma_range;
-        int max_dma_burst;
-        int parity;
-        int reserved[4];
-} tcinfo;
-
-#define MAX_SLOT 7
-
-typedef struct {
-        unsigned long base_addr;
-        unsigned char name[9];
-        unsigned char vendor[9];
-        unsigned char firmware[9];
-        int interrupt;
-        int flags;
-} slot_info;
-
-/*
- * Values for flags
- */
-#define FREE    1<<0
-#define IN_USE  1<<1
-
-
diff --git a/include/asm-mips/dec/tcmodule.h b/include/asm-mips/dec/tcmodule.h
deleted file mode 100644
index 6268e8915d87..000000000000
--- a/include/asm-mips/dec/tcmodule.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Offsets for the ROM header locations for
- * TURBOchannel cards
- *
- * created from:
- *
- * TURBOchannel Firmware Specification
- *
- * EK-TCAAD-FS-004
- * from Digital Equipment Corporation
- *
- * Jan.1998 Harald Koerfgen
- */
-#ifndef __ASM_DEC_TCMODULE_H
-#define __ASM_DEC_TCMODULE_H
-
-#define OLDCARD 0x3c0000
-#define NEWCARD 0x000000
-
-#define TC_ROM_WIDTH    0x3e0
-#define TC_ROM_STRIDE   0x3e4
-#define TC_ROM_SIZE     0x3e8
-#define TC_SLOT_SIZE    0x3ec
-#define TC_PATTERN0     0x3f0
-#define TC_PATTERN1     0x3f4
-#define TC_PATTERN2     0x3f8
-#define TC_PATTERN3     0x3fc
-#define TC_FIRM_VER     0x400
-#define TC_VENDOR       0x420
-#define TC_MODULE       0x440
-#define TC_FIRM_TYPE    0x460
-#define TC_FLAGS        0x470
-#define TC_ROM_OBJECTS  0x480
-
-#endif /* __ASM_DEC_TCMODULE_H */
diff --git a/include/linux/eisa.h b/include/linux/eisa.h
index 1ff7c1392525..fe806b6f030d 100644
--- a/include/linux/eisa.h
+++ b/include/linux/eisa.h
@@ -61,10 +61,20 @@ struct eisa_driver {
 
 #define to_eisa_driver(drv) container_of(drv,struct eisa_driver, driver)
 
+/* These external functions are only available when EISA support is enabled. */
+#ifdef CONFIG_EISA
+
 extern struct bus_type eisa_bus_type;
 int eisa_driver_register (struct eisa_driver *edrv);
 void eisa_driver_unregister (struct eisa_driver *edrv);
 
+#else /* !CONFIG_EISA */
+
+static inline int eisa_driver_register (struct eisa_driver *edrv) { return 0; }
+static inline void eisa_driver_unregister (struct eisa_driver *edrv) { }
+
+#endif /* !CONFIG_EISA */
+
 /* Mimics pci.h... */
 static inline void *eisa_get_drvdata (struct eisa_device *edev)
 {
diff --git a/include/linux/tc.h b/include/linux/tc.h
new file mode 100644
index 000000000000..f92511e57cdb
--- /dev/null
+++ b/include/linux/tc.h
@@ -0,0 +1,141 @@
+/*
+ *      Interface to the TURBOchannel related routines.
+ *
+ *      Copyright (c) 1998  Harald Koerfgen
+ *      Copyright (c) 2005  James Simmons
+ *      Copyright (c) 2006  Maciej W. Rozycki
+ *
+ *      Based on:
+ *
+ *      "TURBOchannel Firmware Specification", EK-TCAAD-FS-004
+ *
+ *      from Digital Equipment Corporation.
+ *
+ *      This file is subject to the terms and conditions of the GNU
+ *      General Public License.  See the file "COPYING" in the main
+ *      directory of this archive for more details.
+ */
+#ifndef _LINUX_TC_H
+#define _LINUX_TC_H
+
+#include <linux/compiler.h>
+#include <linux/device.h>
+#include <linux/ioport.h>
+#include <linux/types.h>
+
+/*
+ * Offsets for the ROM header locations for TURBOchannel cards.
+ */
+#define TC_OLDCARD      0x3c0000
+#define TC_NEWCARD      0x000000
+
+#define TC_ROM_WIDTH    0x3e0
+#define TC_ROM_STRIDE   0x3e4
+#define TC_ROM_SIZE     0x3e8
+#define TC_SLOT_SIZE    0x3ec
+#define TC_PATTERN0     0x3f0
+#define TC_PATTERN1     0x3f4
+#define TC_PATTERN2     0x3f8
+#define TC_PATTERN3     0x3fc
+#define TC_FIRM_VER     0x400
+#define TC_VENDOR       0x420
+#define TC_MODULE       0x440
+#define TC_FIRM_TYPE    0x460
+#define TC_FLAGS        0x470
+#define TC_ROM_OBJECTS  0x480
+
+/*
+ * Information obtained through the get_tcinfo() PROM call.
+ */
+struct tcinfo {
+        s32             revision;       /* Hardware revision level. */
+        s32             clk_period;     /* Clock period in nanoseconds. */
+        s32             slot_size;      /* Slot size in megabytes. */
+        s32             io_timeout;     /* I/O timeout in cycles. */
+        s32             dma_range;      /* DMA address range in megabytes. */
+        s32             max_dma_burst;  /* Maximum DMA burst length. */
+        s32             parity;         /* System module supports TC parity. */
+        s32             reserved[4];
+};
+
+/*
+ * TURBOchannel bus.
+ */
+struct tc_bus {
+        struct list_head devices;       /* List of devices on this bus. */
+        struct resource resource[2];    /* Address space routed to this bus. */
+
+        struct device   dev;
+        char            name[13];
+        resource_size_t slot_base;
+        resource_size_t ext_slot_base;
+        resource_size_t ext_slot_size;
+        int             num_tcslots;
+        struct tcinfo   info;
+};
+
+/*
+ * TURBOchannel device.
+ */
+struct tc_dev {
+        struct list_head node;          /* Node in list of all TC devices. */
+        struct tc_bus   *bus;           /* Bus this device is on. */
+        struct tc_driver *driver;       /* Which driver has allocated this
+                                           device. */
+        struct device   dev;            /* Generic device interface. */
+        struct resource resource;       /* Address space of this device. */
+        char            vendor[9];
+        char            name[9];
+        char            firmware[9];
+        int             interrupt;
+        int             slot;
+};
+
+#define to_tc_dev(n) container_of(n, struct tc_dev, dev)
+
+struct tc_device_id {
+        char            vendor[9];
+        char            name[9];
+};
+
+/*
+ * TURBOchannel driver.
+ */
+struct tc_driver {
+        struct list_head node;
+        const struct tc_device_id *id_table;
+        struct device_driver driver;
+};
+
+#define to_tc_driver(drv) container_of(drv, struct tc_driver, driver)
+
+/*
+ * Return TURBOchannel clock frequency in Hz.
+ */
+static inline unsigned long tc_get_speed(struct tc_bus *tbus)
+{
+        return 100000 * (10000 / (unsigned long)tbus->info.clk_period);
+}
+
+#ifdef CONFIG_TC
+
+extern struct bus_type tc_bus_type;
+
+extern int tc_register_driver(struct tc_driver *tdrv);
+extern void tc_unregister_driver(struct tc_driver *tdrv);
+
+#else /* !CONFIG_TC */
+
+static inline int tc_register_driver(struct tc_driver *tdrv) { return 0; }
+static inline void tc_unregister_driver(struct tc_driver *tdrv) { }
+
+#endif /* CONFIG_TC */
+
+/*
+ * These have to be provided by the architecture.
+ */
+extern int tc_preadb(u8 *valp, void __iomem *addr);
+extern int tc_bus_get_info(struct tc_bus *tbus);
+extern void tc_device_get_irq(struct tc_dev *tdev);
+
+#endif /* _LINUX_TC_H */