Commit 7749c902 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide-scsi: use print_hex_dump from <linux/kernel.h>
  ide: More TSST drives with broken cable detection
  ali14xx: constify __initdata
  ide: remove bogus ide_fix_driveid() comment
  trm290: remove bogus init_hwif_trm290() comment
  piix: add HP compaq laptop to short cable list
  alim15x3: add Mitac 8317 and derivatives to ali_cable_override()
  ide: add TORiSAN model: CD-ROM CDR_U200 fw: 1.09 to DMA blacklist
  amd74xx: arm hack
  drivers/ide: Add missing "space"
  ide-cris: don't override ide_register_hw() result
  ide: move CONFIG_IDE_ETRAX to drivers/ide/Kconfig
  ide: add CONFIG_IDE_H8300 config option
  ide/Kconfig: fix mpc8xx host driver dependencies
  macide/q40ide: add missing __init tag to {macide,q40ide}_init()
  aec62xx: Fix kernel oops in driver's probe function
  ide: skip ide_wait_not_busy() on noprobe-disks
  siimage: remove resetproc() method
  ide: don't set PIO mode on pre-EIDE drives
  sis5513.c: Add Packard Bell EasyNote K5305 to laptops
parents 2ea07188 6413f086

arch/cris/arch-v10/drivers/Kconfig

+0 −39
Original line number Diff line number Diff line
@@ -542,45 +542,6 @@ config ETRAX_RS485_DISABLE_RECEIVER 
	  loopback.  Not all products are able to do this in software only.

	  Axis 2400/2401 must disable receiver.



config ETRAX_IDE

	bool "ATA/IDE support"

	select IDE

	select BLK_DEV_IDE

	select BLK_DEV_IDEDISK

	select BLK_DEV_IDECD

	select BLK_DEV_IDEDMA

	select IDE_GENERIC

	help

	  Enable this to get support for ATA/IDE.

	  You can't use parallel ports or SCSI ports

	  at the same time.





config ETRAX_IDE_DELAY

	int "Delay for drives to regain consciousness"

	depends on ETRAX_IDE

	default 15

	help

	  Number of seconds to wait for IDE drives to spin up after an IDE

	  reset.

choice

	prompt "IDE reset pin"

	depends on ETRAX_IDE

	default ETRAX_IDE_PB7_RESET



config ETRAX_IDE_PB7_RESET

	bool "Port_PB_Bit_7"

	help

	  IDE reset on pin 7 on port B



config ETRAX_IDE_G27_RESET

	bool "Port_G_Bit_27"

	help

	  IDE reset on pin 27 on port G



endchoice





config ETRAX_USB_HOST

	bool "USB host"

	select USB

arch/cris/arch-v32/drivers/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -582,18 +582,6 @@ config ETRAX_PE_CHANGEABLE_BITS 
	  that a user can change the value on using ioctl's.

	  Bit set = changeable.



config ETRAX_IDE

	bool "ATA/IDE support"

	depends on ETRAX_ARCH_V32

	select IDE

	select BLK_DEV_IDE

	select BLK_DEV_IDEDISK

	select BLK_DEV_IDECD

	select BLK_DEV_IDEDMA

	select IDE_GENERIC

	help

	  Enables the ETRAX IDE driver.



config ETRAX_CARDBUS

        bool "Cardbus support"

        depends on ETRAX_ARCH_V32

drivers/ide/Kconfig

+45 −2
Original line number Diff line number Diff line
@@ -313,7 +313,6 @@ comment "IDE chipset support/bugfixes" 


config IDE_GENERIC

	tristate "generic/default IDE chipset support"

	default H8300

	help

	  If unsure, say N.
@@ -484,6 +483,7 @@ config WDC_ALI15X3 


config BLK_DEV_AMD74XX

	tristate "AMD and nVidia IDE support"

	depends on !ARM

	select BLK_DEV_IDEDMA_PCI

	help

	  This driver adds explicit support for AMD-7xx and AMD-8111 chips
@@ -883,6 +883,49 @@ config BLK_DEV_IDE_BAST 
	  Say Y here if you want to support the onboard IDE channels on the

	  Simtec BAST or the Thorcom VR1000



config ETRAX_IDE

	bool "ETRAX IDE support"

	depends on CRIS && BROKEN

	select BLK_DEV_IDEDMA

	select IDE_GENERIC

	help

	  Enables the ETRAX IDE driver.



	  You can't use parallel ports or SCSI ports at the same time.



config ETRAX_IDE_DELAY

	int "Delay for drives to regain consciousness"

	depends on ETRAX_IDE && ETRAX_ARCH_V10

	default 15

	help

	  Number of seconds to wait for IDE drives to spin up after an IDE

	  reset.



choice

	prompt "IDE reset pin"

	depends on ETRAX_IDE && ETRAX_ARCH_V10

	default ETRAX_IDE_PB7_RESET



config ETRAX_IDE_PB7_RESET

	bool "Port_PB_Bit_7"

	help

	  IDE reset on pin 7 on port B



config ETRAX_IDE_G27_RESET

	bool "Port_G_Bit_27"

	help

	  IDE reset on pin 27 on port G



endchoice



config IDE_H8300

	bool "H8300 IDE support"

	depends on H8300

	select IDE_GENERIC

	default y

	help

	  Enables the H8300 IDE driver.



config BLK_DEV_GAYLE

	bool "Amiga Gayle IDE interface support"

	depends on AMIGA
@@ -963,7 +1006,7 @@ config BLK_DEV_Q40IDE 


config BLK_DEV_MPC8xx_IDE

	bool "MPC8xx IDE support"

	depends on 8xx && IDE=y && BLK_DEV_IDE=y && !PPC_MERGE

	depends on 8xx && (LWMON || IVMS8 || IVML24 || TQM8xxL) && IDE=y && BLK_DEV_IDE=y && !PPC_MERGE

	select IDE_GENERIC

	help

	  This option provides support for IDE on Motorola MPC8xx Systems.

drivers/ide/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE) += ppc/mpc8xx.o 
ide-core-$(CONFIG_BLK_DEV_IDE_PMAC)	+= ppc/pmac.o



# built-in only drivers from h8300/

ide-core-$(CONFIG_H8300)		+= h8300/ide-h8300.o

ide-core-$(CONFIG_IDE_H8300)		+= h8300/ide-h8300.o



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

obj-$(CONFIG_IDE_GENERIC)		+= ide-generic.o

drivers/ide/cris/ide-cris.c

+4 −3
Original line number Diff line number Diff line
@@ -773,15 +773,16 @@ init_e100_ide (void) 
	/* the IDE control register is at ATA address 6, with CS1 active instead of CS0 */

	ide_offsets[IDE_CONTROL_OFFSET] = cris_ide_reg_addr(6, 1, 0);



	/* first fill in some stuff in the ide_hwifs fields */

	for (h = 0; h < 4; h++) {

		ide_hwif_t *hwif = NULL;



	for(h = 0; h < MAX_HWIFS; h++) {

		ide_hwif_t *hwif = &ide_hwifs[h];

		ide_setup_ports(&hw, cris_ide_base_address(h),

		                ide_offsets,

		                0, 0, cris_ide_ack_intr,

		                ide_default_irq(0));

		ide_register_hw(&hw, NULL, 1, &hwif);

		if (hwif == NULL)

			continue;

		hwif->mmio = 1;

		hwif->chipset = ide_etrax100;

		hwif->set_pio_mode = &cris_set_pio_mode;

CRA Git | Maintained and supported by SUSTech CRA and CCSE