Commit 74a6d0f0 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: (33 commits)
  ide-cd: remove dead dsc_overlap setting
  ide: push local_irq_{save,restore}() to do_identify()
  ide: remove superfluous local_irq_{save,restore}() from ide_dump_status()
  ide: move legacy ISA/VLB ports handling to ide-legacy.c (v2)
  ide: move Power Management support to ide-pm.c
  ide: use ATA_DMA_* defines in ide-dma-sff.c
  ide: checkpatch.pl fixes for ide-lib.c
  ide: remove inline tags from ide-probe.c
  ide: remove redundant code from ide_end_drive_cmd()
  ide: struct device - replace bus_id with dev_name(), dev_set_name()
  ide: rework handling of serialized ports (v2)
  cy82c693: remove superfluous ide_cy82c693 chipset type
  trm290: add IDE_HFLAG_TRM290 host flag
  ide: add ->max_sectors field to struct ide_port_info
  rz1000: apply chipset quirks early (v2)
  ide: always set nIEN on idle devices
  ide: fix ->quirk_list checking in ide_do_request()
  gayle: set IDE_HFLAG_SERIALIZE explictly
  cmd64x: set IDE_HFLAG_SERIALIZE explictly for CMD646
  ali14xx: doesn't use shared IRQs
  ...
parents 14eeee88 519d6808

drivers/ide/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ config IDE_TIMINGS 
config IDE_ATAPI

	bool



config IDE_LEGACY

	bool



config BLK_DEV_IDE_SATA

	bool "Support for SATA (deprecated; conflicts with libata SATA driver)"

	default n
@@ -856,6 +859,7 @@ config BLK_DEV_4DRIVES 
config BLK_DEV_ALI14XX

	tristate "ALI M14xx support"

	select IDE_TIMINGS

	select IDE_LEGACY

	help

	  This driver is enabled at runtime using the "ali14xx.probe" kernel

	  boot parameter.  It enables support for the secondary IDE interface
@@ -866,6 +870,7 @@ config BLK_DEV_ALI14XX 


config BLK_DEV_DTC2278

	tristate "DTC-2278 support"

	select IDE_LEGACY

	help

	  This driver is enabled at runtime using the "dtc2278.probe" kernel

	  boot parameter. It enables support for the secondary IDE interface
@@ -876,6 +881,7 @@ config BLK_DEV_DTC2278 
config BLK_DEV_HT6560B

	tristate "Holtek HT6560B support"

	select IDE_TIMINGS

	select IDE_LEGACY

	help

	  This driver is enabled at runtime using the "ht6560b.probe" kernel

	  boot parameter. It enables support for the secondary IDE interface
@@ -886,6 +892,7 @@ config BLK_DEV_HT6560B 
config BLK_DEV_QD65XX

	tristate "QDI QD65xx support"

	select IDE_TIMINGS

	select IDE_LEGACY

	help

	  This driver is enabled at runtime using the "qd65xx.probe" kernel

	  boot parameter.  It permits faster I/O speeds to be set.  See the
@@ -894,6 +901,7 @@ config BLK_DEV_QD65XX 


config BLK_DEV_UMC8672

	tristate "UMC-8672 support"

	select IDE_LEGACY

	help

	  This driver is enabled at runtime using the "umc8672.probe" kernel

	  boot parameter. It enables support for the secondary IDE interface

drivers/ide/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
EXTRA_CFLAGS				+= -Idrivers/ide



ide-core-y += ide.o ide-ioctls.o ide-io.o ide-iops.o ide-lib.o ide-probe.o \

	      ide-taskfile.o ide-park.o ide-pio-blacklist.o

	      ide-taskfile.o ide-pm.o ide-park.o ide-pio-blacklist.o



# core IDE code

ide-core-$(CONFIG_IDE_TIMINGS)		+= ide-timings.o
@@ -15,6 +15,7 @@ ide-core-$(CONFIG_BLK_DEV_IDEDMA) += ide-dma.o 
ide-core-$(CONFIG_BLK_DEV_IDEDMA_SFF)	+= ide-dma-sff.o

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

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

ide-core-$(CONFIG_IDE_LEGACY)		+= ide-legacy.o



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

drivers/ide/cmd64x.c

+2 −2
Original line number Diff line number Diff line
@@ -424,10 +424,10 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = { 
		.name		= DRV_NAME,

		.init_chipset	= init_chipset_cmd64x,

		.enablebits	= {{0x51,0x04,0x04}, {0x51,0x08,0x08}},

		.chipset	= ide_cmd646,

		.port_ops	= &cmd64x_port_ops,

		.dma_ops	= &cmd648_dma_ops,

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH,

		.host_flags	= IDE_HFLAG_SERIALIZE |

				  IDE_HFLAG_ABUSE_PREFETCH,

		.pio_mask	= ATA_PIO5,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA2,

drivers/ide/cy82c693.c

+0 −1
Original line number Diff line number Diff line
@@ -292,7 +292,6 @@ static const struct ide_port_info cy82c693_chipset __devinitdata = { 
	.name		= DRV_NAME,

	.init_iops	= init_iops_cy82c693,

	.port_ops	= &cy82c693_port_ops,

	.chipset	= ide_cy82c693,

	.host_flags	= IDE_HFLAG_SINGLE,

	.pio_mask	= ATA_PIO4,

	.swdma_mask	= ATA_SWDMA2,

drivers/ide/gayle.c

+5 −1
Original line number Diff line number Diff line
@@ -117,6 +117,10 @@ static void __init gayle_setup_ports(hw_regs_t *hw, unsigned long base, 
	hw->chipset = ide_generic;

}



static const struct ide_port_info gayle_port_info = {

	.host_flags		= IDE_HFLAG_SERIALIZE | IDE_HFLAG_NO_DMA,

};



    /*

     *  Probe for a Gayle IDE interface (and optionally for an IDE doubler)

     */
@@ -178,7 +182,7 @@ found: 
	hws[i] = &hw[i];

    }



    rc = ide_host_add(NULL, hws, NULL);

    rc = ide_host_add(&gayle_port_info, hws, NULL);

    if (rc)

	release_mem_region(res_start, res_n);

CRA Git | Maintained and supported by SUSTech CRA and CCSE