Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cb7396b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: fix PIO setup on resume for ATAPI devices
  ide: legacy PCI bus order probing fixes
  ide: add ide_proc_register_port()
  ide: add "initializing" argument to ide_register_hw()
  ide: cable detection fixes (take 2)
  ide: move IDE settings handling to ide-proc.c
  ide: split off ioctl handling from IDE settings (v2)
  ide: make /proc/ide/ optional
  ide: add ide_tune_dma() helper
  ide: rework the code for selecting the best DMA transfer mode (v3)
  ide: fix UDMA/MWDMA/SWDMA masks (v3)
parents d0b6e0e3 317a46a2

drivers/ide/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -291,6 +291,17 @@ config IDE_TASK_IOCTL 


	  If you are unsure, say N here.



config IDE_PROC_FS

	bool "legacy /proc/ide/ support"

	depends on IDE && PROC_FS

	default y

	help

	  This option enables support for the various files in

	  /proc/ide.  In Linux 2.6 this has been superseded by

	  files in sysfs but many legacy applications rely on this.



	  If unsure say Y.



comment "IDE chipset support/bugfixes"



config IDE_GENERIC
@@ -360,6 +371,9 @@ config IDEPCI_SHARE_IRQ 
	  It is safe to say Y to this question, in most cases.

	  If unsure, say N.



config IDEPCI_PCIBUS_ORDER

	def_bool PCI && BLK_DEV_IDE=y && BLK_DEV_IDEPCI



config BLK_DEV_OFFBOARD

	bool "Boot off-board chipsets first support"

	depends on PCI && BLK_DEV_IDEPCI

drivers/ide/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ ide-core-$(CONFIG_BLK_DEV_CMD640) += pci/cmd640.o 
# Core IDE code - must come before legacy

ide-core-$(CONFIG_BLK_DEV_IDEPCI)	+= setup-pci.o

ide-core-$(CONFIG_BLK_DEV_IDEDMA)	+= ide-dma.o

ide-core-$(CONFIG_PROC_FS)		+= ide-proc.o

ide-core-$(CONFIG_IDE_PROC_FS)		+= ide-proc.o

ide-core-$(CONFIG_BLK_DEV_IDEPNP)	+= ide-pnp.o

ide-core-$(CONFIG_BLK_DEV_IDEACPI)	+= ide-acpi.o

drivers/ide/arm/bast-ide.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ bastide_register(unsigned int base, unsigned int aux, int irq, 
	hw.io_ports[IDE_CONTROL_OFFSET] = aux + (6 * 0x20);

	hw.irq = irq;



	ide_register_hw(&hw, hwif);

	ide_register_hw(&hw, 0, hwif);



	return 0;

}

drivers/ide/arm/icside.c

+6 −3
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ static int icside_dma_check(ide_drive_t *drive) 
	 * Enable DMA on any drive that has multiword DMA

	 */

	if (id->field_valid & 2) {

		xfer_mode = ide_dma_speed(drive, 0);

		xfer_mode = ide_max_dma_mode(drive);

		goto out;

	}
@@ -591,7 +591,8 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec) 
	state->hwif[0] = hwif;



	probe_hwif_init(hwif);

	create_proc_ide_interfaces();



	ide_proc_register_port(hwif);



	return 0;

}
@@ -679,7 +680,9 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) 


	probe_hwif_init(hwif);

	probe_hwif_init(mate);

	create_proc_ide_interfaces();



	ide_proc_register_port(hwif);

	ide_proc_register_port(mate);



	return 0;

drivers/ide/arm/ide_arm.c

+1 −1
Original line number Diff line number Diff line
@@ -38,6 +38,6 @@ void __init ide_arm_init(void) 
		memset(&hw, 0, sizeof(hw));

		ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206);

		hw.irq = IDE_ARM_IRQ;

		ide_register_hw(&hw, NULL);

		ide_register_hw(&hw, 1, NULL);

	}

}