3 files changed, 148 insertions, 0 deletions

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index d781b2cd3d62..0e511ca50b84 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -167,6 +167,13 @@ config BLK_DEV_IDECS
           Support for Compact Flash cards, outboard IDE disks, tape drives,
           and CD-ROM drives connected through a PCMCIA card.
 
+config BLK_DEV_DELKIN
+        tristate "Cardbus IDE support (Delkin/ASKA/Workbit)"
+        depends on CARDBUS && PCI
+        help
+          Support for Delkin, ASKA, and Workbit Cardbus CompactFlash
+          Adapters.  This may also work for similar SD and XD adapters.
+
 config BLK_DEV_IDECD
         tristate "Include IDE/ATAPI CDROM support"
         ---help---
diff --git a/drivers/ide/pci/Makefile b/drivers/ide/pci/Makefile
index 64776ab4329f..6591ff4753cb 100644
--- a/drivers/ide/pci/Makefile
+++ b/drivers/ide/pci/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_BLK_DEV_CS5530)		+= cs5530.o
 obj-$(CONFIG_BLK_DEV_CS5535)            += cs5535.o
 obj-$(CONFIG_BLK_DEV_SC1200)            += sc1200.o
 obj-$(CONFIG_BLK_DEV_CY82C693)          += cy82c693.o
+obj-$(CONFIG_BLK_DEV_DELKIN)            += delkin_cb.o
 obj-$(CONFIG_BLK_DEV_HPT34X)            += hpt34x.o
 obj-$(CONFIG_BLK_DEV_HPT366)            += hpt366.o
 obj-$(CONFIG_BLK_DEV_IT8213)            += it8213.o
diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c
new file mode 100644
index 000000000000..e2672fc65d30
--- /dev/null
+++ b/drivers/ide/pci/delkin_cb.c
@@ -0,0 +1,140 @@
+/*
+ *  linux/drivers/ide/pci/delkin_cb.c
+ *
+ *  Created 20 Oct 2004 by Mark Lord
+ *
+ *  Basic support for Delkin/ASKA/Workbit Cardbus CompactFlash adapter
+ *
+ *  Modeled after the 16-bit PCMCIA driver: ide-cs.c
+ *
+ *  This is slightly peculiar, in that it is a PCI driver,
+ *  but is NOT an IDE PCI driver -- the IDE layer does not directly
+ *  support hot insertion/removal of PCI interfaces, so this driver
+ *  is unable to use the IDE PCI interfaces.  Instead, it uses the
+ *  same interfaces as the ide-cs (PCMCIA) driver uses.
+ *  On the plus side, the driver is also smaller/simpler this way.
+ *
+ *  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.
+ */
+#include <linux/autoconf.h>
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/mm.h>
+#include <linux/blkdev.h>
+#include <linux/hdreg.h>
+#include <linux/ide.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <asm/io.h>
+
+/*
+ * No chip documentation has yet been found,
+ * so these configuration values were pulled from
+ * a running Win98 system using "debug".
+ * This gives around 3MByte/second read performance,
+ * which is about 2/3 of what the chip is capable of.
+ *
+ * There is also a 4KByte mmio region on the card,
+ * but its purpose has yet to be reverse-engineered.
+ */
+static const u8 setup[] = {
+        0x00, 0x05, 0xbe, 0x01, 0x20, 0x8f, 0x00, 0x00,
+        0xa4, 0x1f, 0xb3, 0x1b, 0x00, 0x00, 0x00, 0x80,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xa4, 0x83, 0x02, 0x13,
+};
+
+static int __devinit
+delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
+{
+        unsigned long base;
+        hw_regs_t hw;
+        ide_hwif_t *hwif = NULL;
+        ide_drive_t *drive;
+        int i, rc;
+
+        rc = pci_enable_device(dev);
+        if (rc) {
+                printk(KERN_ERR "delkin_cb: pci_enable_device failed (%d)\n", rc);
+                return rc;
+        }
+        rc = pci_request_regions(dev, "delkin_cb");
+        if (rc) {
+                printk(KERN_ERR "delkin_cb: pci_request_regions failed (%d)\n", rc);
+                pci_disable_device(dev);
+                return rc;
+        }
+        base = pci_resource_start(dev, 0);
+        outb(0x02, base + 0x1e);        /* set nIEN to block interrupts */
+        inb(base + 0x17);               /* read status to clear interrupts */
+        for (i = 0; i < sizeof(setup); ++i) {
+                if (setup[i])
+                        outb(setup[i], base + i);
+        }
+        pci_release_regions(dev);       /* IDE layer handles regions itself */
+
+        memset(&hw, 0, sizeof(hw));
+        ide_std_init_ports(&hw, base + 0x10, base + 0x1e);
+        hw.irq = dev->irq;
+        hw.chipset = ide_pci;           /* this enables IRQ sharing */
+
+        rc = ide_register_hw_with_fixup(&hw, &hwif, ide_undecoded_slave);
+        if (rc < 0) {
+                printk(KERN_ERR "delkin_cb: ide_register_hw failed (%d)\n", rc);
+                pci_disable_device(dev);
+                return -ENODEV;
+        }
+        pci_set_drvdata(dev, hwif);
+        hwif->pci_dev = dev;
+        drive = &hwif->drives[0];
+        if (drive->present) {
+                drive->io_32bit = 1;
+                drive->unmask   = 1;
+        }
+        return 0;
+}
+
+static void
+delkin_cb_remove (struct pci_dev *dev)
+{
+        ide_hwif_t *hwif = pci_get_drvdata(dev);
+
+        if (hwif)
+                ide_unregister(hwif->index);
+        pci_disable_device(dev);
+}
+
+static struct pci_device_id delkin_cb_pci_tbl[] __devinitdata = {
+        { 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { 0, },
+};
+MODULE_DEVICE_TABLE(pci, delkin_cb_pci_tbl);
+
+static struct pci_driver driver = {
+        .name           = "Delkin-ASKA-Workbit Cardbus IDE",
+        .id_table       = delkin_cb_pci_tbl,
+        .probe          = delkin_cb_probe,
+        .remove         = delkin_cb_remove,
+};
+
+static int
+delkin_cb_init (void)
+{
+        return pci_module_init(&driver);
+}
+
+static void
+delkin_cb_exit (void)
+{
+        pci_unregister_driver(&driver);
+}
+
+module_init(delkin_cb_init);
+module_exit(delkin_cb_exit);
+
+MODULE_AUTHOR("Mark Lord");
+MODULE_DESCRIPTION("Basic support for Delkin/ASKA/Workbit Cardbus IDE");
+MODULE_LICENSE("GPL");
+