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

CREDITS

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -495,6 +495,11 @@ S: Kopmansg 2
	S: 411 13 Goteborg		S: 411 13 Goteborg
	S: Sweden		S: Sweden

			N: Paul Bristow
			E: paul@paulbristow.net
			W: http://paulbristow.net/linux/idefloppy.html
			D: Maintainer of IDE/ATAPI floppy driver

	N: Dominik Brodowski		N: Dominik Brodowski
	E: linux@brodo.de		E: linux@brodo.de
	W: http://www.brodo.de/		W: http://www.brodo.de/
	@@ -2642,6 +2647,10 @@ S: C/ Mieses 20, 9-B
	S: Valladolid 47009		S: Valladolid 47009
	S: Spain		S: Spain

			N: Gadi Oxman
			E: gadio@netvision.net.il
			D: Original author and maintainer of IDE/ATAPI floppy/tape drivers

	N: Greg Page		N: Greg Page
	E: gpage@sovereign.org		E: gpage@sovereign.org
	D: IPX development and support		D: IPX development and support

MAINTAINERS

+1 −14

Original line number	Original line	Diff line number	Diff line
	@@ -2202,25 +2202,12 @@ L: linux-ide@vger.kernel.org
	T: quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/		T: quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/
	S: Maintained		S: Maintained

	IDE/ATAPI CDROM DRIVER		IDE/ATAPI DRIVERS
	P: Borislav Petkov		P: Borislav Petkov
	M: petkovbb@gmail.com		M: petkovbb@gmail.com
	L: linux-ide@vger.kernel.org		L: linux-ide@vger.kernel.org
	S: Maintained		S: Maintained

	IDE/ATAPI FLOPPY DRIVERS
	P: Paul Bristow
	M: Paul Bristow <paul@paulbristow.net>
	W: http://paulbristow.net/linux/idefloppy.html
	L: linux-kernel@vger.kernel.org
	S: Maintained

	IDE/ATAPI TAPE DRIVERS
	P: Gadi Oxman
	M: Gadi Oxman <gadio@netvision.net.il>
	L: linux-kernel@vger.kernel.org
	S: Maintained

	IDLE-I7300		IDLE-I7300
	P: Andy Henroid		P: Andy Henroid
	M: andrew.d.henroid@intel.com		M: andrew.d.henroid@intel.com

drivers/ide/Kconfig

+11 −22

Original line number	Original line	Diff line number	Diff line
	@@ -222,7 +222,8 @@ comment "IDE chipset support/bugfixes"

	config IDE_GENERIC		config IDE_GENERIC
	tristate "generic/default IDE chipset support"		tristate "generic/default IDE chipset support"
	depends on ALPHA \|\| X86 \|\| IA64 \|\| M32R \|\| MIPS		depends on ALPHA \|\| X86 \|\| IA64 \|\| M32R \|\| MIPS \|\| ARCH_RPC \|\| ARCH_SHARK
			default ARM && (ARCH_RPC \|\| ARCH_SHARK)
	help		help
	This is the generic IDE driver. This driver attaches to the		This is the generic IDE driver. This driver attaches to the
	fixed legacy ports (e.g. on PCs 0x1f0/0x170, 0x1e8/0x168 and		fixed legacy ports (e.g. on PCs 0x1f0/0x170, 0x1e8/0x168 and
	@@ -680,7 +681,7 @@ endif
	# TODO: BLK_DEV_IDEDMA_PCI -> BLK_DEV_IDEDMA_SFF		# TODO: BLK_DEV_IDEDMA_PCI -> BLK_DEV_IDEDMA_SFF
	config BLK_DEV_IDE_PMAC		config BLK_DEV_IDE_PMAC
	tristate "PowerMac on-board IDE support"		tristate "PowerMac on-board IDE support"
	depends on PPC_PMAC && IDE=y		depends on PPC_PMAC
	select IDE_TIMINGS		select IDE_TIMINGS
	select BLK_DEV_IDEDMA_PCI		select BLK_DEV_IDEDMA_PCI
	help		help
	@@ -731,11 +732,6 @@ config BLK_DEV_IDE_AT91
	depends on ARM && ARCH_AT91 && !ARCH_AT91RM9200 && !ARCH_AT91X40		depends on ARM && ARCH_AT91 && !ARCH_AT91RM9200 && !ARCH_AT91X40
	select IDE_TIMINGS		select IDE_TIMINGS

	config IDE_ARM
	tristate "ARM IDE support"
	depends on ARM && (ARCH_RPC \|\| ARCH_SHARK)
	default y

	config BLK_DEV_IDE_ICSIDE		config BLK_DEV_IDE_ICSIDE
	tristate "ICS IDE interface support"		tristate "ICS IDE interface support"
	depends on ARM && ARCH_ACORN		depends on ARM && ARCH_ACORN
	@@ -774,27 +770,20 @@ config BLK_DEV_GAYLE
	This includes on-board IDE interfaces on some Amiga models (A600,		This includes on-board IDE interfaces on some Amiga models (A600,
	A1200, A4000, and A4000T), and IDE interfaces on the Zorro expansion		A1200, A4000, and A4000T), and IDE interfaces on the Zorro expansion
	bus (M-Tech E-Matrix 530 expansion card).		bus (M-Tech E-Matrix 530 expansion card).
	Say Y if you have an Amiga with a Gayle IDE interface and want to use
	IDE devices (hard disks, CD-ROM drives, etc.) that are connected to
	it.
	Note that you also have to enable Zorro bus support if you want to
	use Gayle IDE interfaces on the Zorro expansion bus.

	config BLK_DEV_IDEDOUBLER		It also provides support for the so-called `IDE doublers' (made
	bool "Amiga IDE Doubler support (EXPERIMENTAL)"
	depends on BLK_DEV_GAYLE && EXPERIMENTAL
	---help---
	This feature provides support for the so-called `IDE doublers' (made
	by various manufacturers, e.g. Eyetech) that can be connected to		by various manufacturers, e.g. Eyetech) that can be connected to
	the on-board IDE interface of some Amiga models. Using such an IDE		the on-board IDE interface of some Amiga models. Using such an IDE
	doubler, you can connect up to four instead of two IDE devices to		doubler, you can connect up to four instead of two IDE devices to
	the Amiga's on-board IDE interface.		the Amiga's on-board IDE interface. The feature is enabled at kernel
			runtime using the "gayle.doubler" kernel boot parameter.

	Note that the normal Amiga Gayle IDE driver may not work correctly		Say Y if you have an Amiga with a Gayle IDE interface and want to use
	if you have an IDE doubler and don't enable this feature!		IDE devices (hard disks, CD-ROM drives, etc.) that are connected to
			it.

	Say Y if you have an IDE doubler. The feature is enabled at kernel		Note that you also have to enable Zorro bus support if you want to
	runtime using the "gayle.doubler" kernel boot parameter.		use Gayle IDE interfaces on the Zorro expansion bus.

	config BLK_DEV_BUDDHA		config BLK_DEV_BUDDHA
	tristate "Buddha/Catweasel/X-Surf IDE interface support (EXPERIMENTAL)"		tristate "Buddha/Catweasel/X-Surf IDE interface support (EXPERIMENTAL)"

drivers/ide/Makefile

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -21,8 +21,6 @@ ide-core-$(CONFIG_IDE_LEGACY) += ide-legacy.o

	obj-$(CONFIG_IDE) += ide-core.o		obj-$(CONFIG_IDE) += ide-core.o

	obj-$(CONFIG_IDE_ARM) += ide_arm.o

	obj-$(CONFIG_BLK_DEV_ALI14XX) += ali14xx.o		obj-$(CONFIG_BLK_DEV_ALI14XX) += ali14xx.o
	obj-$(CONFIG_BLK_DEV_UMC8672) += umc8672.o		obj-$(CONFIG_BLK_DEV_UMC8672) += umc8672.o
	obj-$(CONFIG_BLK_DEV_DTC2278) += dtc2278.o		obj-$(CONFIG_BLK_DEV_DTC2278) += dtc2278.o

drivers/ide/alim15x3.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -189,20 +189,20 @@ static void ali_set_dma_mode(ide_drive_t *drive, const u8 speed)
	}		}

	/**		/**
	* ali15x3_dma_setup - begin a DMA phase		* ali_dma_check - DMA check
	* @drive: target device		* @drive: target device
	* @cmd: command		* @cmd: command
	*		*
	* Returns 1 if the DMA cannot be performed, zero on success.		* Returns 1 if the DMA cannot be performed, zero on success.
	*/		*/

	static int ali15x3_dma_setup(ide_drive_t drive, struct ide_cmd cmd)		static int ali_dma_check(ide_drive_t drive, struct ide_cmd cmd)
	{		{
	if (m5229_revision < 0xC2 && drive->media != ide_disk) {		if (m5229_revision < 0xC2 && drive->media != ide_disk) {
	if (cmd->tf_flags & IDE_TFLAG_WRITE)		if (cmd->tf_flags & IDE_TFLAG_WRITE)
	return 1; /* try PIO instead of DMA */		return 1; /* try PIO instead of DMA */
	}		}
	return ide_dma_setup(drive, cmd);		return 0;
	}		}

	/**		/**
	@@ -503,13 +503,13 @@ static const struct ide_port_ops ali_port_ops = {

	static const struct ide_dma_ops ali_dma_ops = {		static const struct ide_dma_ops ali_dma_ops = {
	.dma_host_set = ide_dma_host_set,		.dma_host_set = ide_dma_host_set,
	.dma_setup = ali15x3_dma_setup,		.dma_setup = ide_dma_setup,
	.dma_start = ide_dma_start,		.dma_start = ide_dma_start,
	.dma_end = ide_dma_end,		.dma_end = ide_dma_end,
	.dma_test_irq = ide_dma_test_irq,		.dma_test_irq = ide_dma_test_irq,
	.dma_lost_irq = ide_dma_lost_irq,		.dma_lost_irq = ide_dma_lost_irq,
			.dma_check = ali_dma_check,
	.dma_timer_expiry = ide_dma_sff_timer_expiry,		.dma_timer_expiry = ide_dma_sff_timer_expiry,
	.dma_timeout = ide_dma_timeout,
	.dma_sff_read_status = ide_dma_sff_read_status,		.dma_sff_read_status = ide_dma_sff_read_status,
	};		};

Admin message