Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (06d5e334) · Commits · 戴 / test

drivers/ata/pata_pcmcia.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -414,6 +414,7 @@ static struct pcmcia_device_id pcmcia_devices[] = {
		PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),
		PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674),
		PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2 ", 0xe37be2b5, 0x8671043b),
		PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF300", 0x7ed2ad87, 0x7e9e78ee),
		PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c),
		PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79),
		PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591),
		@@ -424,6 +425,7 @@ static struct pcmcia_device_id pcmcia_devices[] = {
		PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
		PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
		PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443),
		PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF45", 0x709b1bf1, 0xf68b6f32),
		PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),
		PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2),
		PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),

drivers/ide/Kconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -823,13 +823,6 @@ config BLK_DEV_IDE_RAPIDE
		Say Y here if you want to support the Yellowstone RapIDE controller
		manufactured for use with Acorn computers.

		config BLK_DEV_IDE_BAST
		tristate "Simtec BAST / Thorcom VR1000 IDE support"
		depends on ARM && (ARCH_BAST \|\| MACH_VR1000)
		help
		Say Y here if you want to support the onboard IDE channels on the
		Simtec BAST or the Thorcom VR1000

		config IDE_H8300
		tristate "H8300 IDE support"
		depends on H8300

drivers/ide/arm/Makefile

+0 −1

Original line number	Diff line number	Diff line

		obj-$(CONFIG_BLK_DEV_IDE_ICSIDE) += icside.o
		obj-$(CONFIG_BLK_DEV_IDE_RAPIDE) += rapide.o
		obj-$(CONFIG_BLK_DEV_IDE_BAST) += bast-ide.o
		obj-$(CONFIG_BLK_DEV_PALMCHIP_BK3710) += palm_bk3710.o

		ifeq ($(CONFIG_IDE_ARM), m)

drivers/ide/arm/bast-ide.c

deleted100644 → 0

+0 −90

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2003-2004 Simtec Electronics
		* Ben Dooks <ben@simtec.co.uk>
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*
		*/

		#include <linux/module.h>
		#include <linux/errno.h>
		#include <linux/ide.h>
		#include <linux/init.h>

		#include <asm/mach-types.h>

		#include <asm/io.h>
		#include <asm/irq.h>
		#include <asm/arch/map.h>
		#include <asm/arch/bast-map.h>
		#include <asm/arch/bast-irq.h>

		#define DRV_NAME "bast-ide"

		static int __init bastide_register(unsigned int base, unsigned int aux, int irq)
		{
		ide_hwif_t *hwif;
		hw_regs_t hw;
		int i;
		u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };

		memset(&hw, 0, sizeof(hw));

		base += BAST_IDE_CS;
		aux += BAST_IDE_CS;

		for (i = 0; i <= 7; i++) {
		hw.io_ports_array[i] = (unsigned long)base;
		base += 0x20;
		}

		hw.io_ports.ctl_addr = aux + (6 * 0x20);
		hw.irq = irq;
		hw.chipset = ide_generic;

		hwif = ide_find_port();
		if (hwif == NULL)
		goto out;

		i = hwif->index;

		ide_init_port_data(hwif, i);
		ide_init_port_hw(hwif, &hw);
		hwif->port_ops = NULL;

		idx[0] = i;

		ide_device_add(idx, NULL);
		out:
		return 0;
		}

		static int __init bastide_init(void)
		{
		unsigned long base = BAST_VA_IDEPRI + BAST_IDE_CS;

		/* we can treat the VR1000 and the BAST the same */

		if (!(machine_is_bast() \|\| machine_is_vr1000()))
		return 0;

		printk("BAST: IDE driver, (c) 2003-2004 Simtec Electronics\n");

		if (!request_mem_region(base, 0x400000, DRV_NAME)) {
		printk(KERN_ERR "%s: resources busy\n", DRV_NAME);
		return -EBUSY;
		}

		bastide_register(BAST_VA_IDEPRI, BAST_VA_IDEPRIAUX, IRQ_IDE0);
		bastide_register(BAST_VA_IDESEC, BAST_VA_IDESECAUX, IRQ_IDE1);

		return 0;
		}

		module_init(bastide_init);

		MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
		MODULE_LICENSE("GPL");
		MODULE_DESCRIPTION("Simtec BAST / Thorcom VR1000 IDE driver");

drivers/ide/arm/palm_bk3710.c

+13 −9

Original line number	Diff line number	Diff line
		@@ -353,8 +353,8 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev)
		struct clk *clkp;
		struct resource mem, irq;
		ide_hwif_t *hwif;
		void __iomem *base;
		int pribase, i;
		unsigned long base;
		int i;
		hw_regs_t hw;
		u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };

		@@ -374,22 +374,27 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev)
		printk(KERN_ERR "failed to get memory region resource\n");
		return -ENODEV;
		}

		irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
		if (irq == NULL) {
		printk(KERN_ERR "failed to get IRQ resource\n");
		return -ENODEV;
		}

		base = (void *)mem->start;
		if (request_mem_region(mem->start, mem->end - mem->start + 1,
		"palm_bk3710") == NULL) {
		printk(KERN_ERR "failed to request memory region\n");
		return -EBUSY;
		}

		base = IO_ADDRESS(mem->start);

		/* Configure the Palm Chip controller */
		palm_bk3710_chipinit(base);
		palm_bk3710_chipinit((void __iomem *)base);

		pribase = mem->start + IDE_PALM_ATA_PRI_REG_OFFSET;
		for (i = 0; i < IDE_NR_PORTS - 2; i++)
		hw.io_ports_array[i] = pribase + i;
		hw.io_ports.ctl_addr = mem->start +
		IDE_PALM_ATA_PRI_CTL_OFFSET;
		hw.io_ports_array[i] = base + IDE_PALM_ATA_PRI_REG_OFFSET + i;
		hw.io_ports.ctl_addr = base + IDE_PALM_ATA_PRI_CTL_OFFSET;
		hw.irq = irq->start;
		hw.chipset = ide_palm3710;

		@@ -434,4 +439,3 @@ static int __init palm_bk3710_init(void)

		module_init(palm_bk3710_init);
		MODULE_LICENSE("GPL");

Admin message