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

Commit 8ab68ab4 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: (35 commits)
  siimage: coding style cleanup (take 2)
  ide-cd: clean up cdrom_analyze_sense_data()
  ide-cd: fix test unsigned var < 0
  ide: add TSSTcorp CDDVDW SH-S202H to ivb_list[]
  piix: add Asus Eee 701 controller to short cable list
  ARM: always select HAVE_IDE
  remove the broken ETRAX_IDE driver
  ide: remove ->dma_prdtable field from ide_hwif_t
  ide: remove ->dma_vendor{1,3} fields from ide_hwif_t
  scc_pata: add ->dma_host_set and ->dma_start methods
  ide: skip "VLB sync" if host uses MMIO
  ide: add ide_pad_transfer() helper
  ide: remove ->INW and ->OUTW methods
  ide: use IDE I/O helpers directly in ide_tf_{load,read}()
  ns87415: add ->tf_read method
  scc_pata: add ->tf_{load,read} methods
  ide-h8300: add ->tf_{load,read} methods
  ide-cris: add ->tf_{load,read} methods
  ide: add ->tf_load and ->tf_read methods
  ide: move ide_tf_{load,read} to ide-iops.c
  ...
parents f05c463b 7b255436

arch/arm/Kconfig

+1 −14
Original line number Original line Diff line number Diff line
@@ -8,6 +8,7 @@ mainmenu "Linux Kernel Configuration" 
config ARM

config ARM

	bool

	bool

	default y

	default y

	select HAVE_IDE

	select RTC_LIB

	select RTC_LIB

	select SYS_SUPPORTS_APM_EMULATION

	select SYS_SUPPORTS_APM_EMULATION

	select HAVE_OPROFILE

	select HAVE_OPROFILE
@@ -223,7 +224,6 @@ config ARCH_CLPS7500 
	select TIMER_ACORN

	select TIMER_ACORN

	select ISA

	select ISA

	select NO_IOPORT

	select NO_IOPORT

	select HAVE_IDE

	help

	help

	  Support for the Cirrus Logic PS7500FE system-on-a-chip.

	  Support for the Cirrus Logic PS7500FE system-on-a-chip.
@@ -236,7 +236,6 @@ config ARCH_CO285 
	bool "Co-EBSA285"

	bool "Co-EBSA285"

	select FOOTBRIDGE

	select FOOTBRIDGE

	select FOOTBRIDGE_ADDIN

	select FOOTBRIDGE_ADDIN

	select HAVE_IDE

	help

	help

	  Support for Intel's EBSA285 companion chip.

	  Support for Intel's EBSA285 companion chip.
@@ -262,7 +261,6 @@ config ARCH_EP93XX 
config ARCH_FOOTBRIDGE

config ARCH_FOOTBRIDGE

	bool "FootBridge"

	bool "FootBridge"

	select FOOTBRIDGE

	select FOOTBRIDGE

	select HAVE_IDE

	help

	help

	  Support for systems based on the DC21285 companion chip

	  Support for systems based on the DC21285 companion chip

	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.

	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
@@ -301,7 +299,6 @@ config ARCH_IOP32X 
	depends on MMU

	depends on MMU

	select PLAT_IOP

	select PLAT_IOP

	select PCI

	select PCI

	select HAVE_IDE

	help

	help

	  Support for Intel's 80219 and IOP32X (XScale) family of

	  Support for Intel's 80219 and IOP32X (XScale) family of

	  processors.

	  processors.
@@ -311,14 +308,12 @@ config ARCH_IOP33X 
	depends on MMU

	depends on MMU

	select PLAT_IOP

	select PLAT_IOP

	select PCI

	select PCI

	select HAVE_IDE

	help

	help

	  Support for Intel's IOP33X (XScale) family of processors.

	  Support for Intel's IOP33X (XScale) family of processors.





config ARCH_IXP23XX

config ARCH_IXP23XX

 	bool "IXP23XX-based"

 	bool "IXP23XX-based"

	depends on MMU

	depends on MMU

	select HAVE_IDE

 	select PCI

 	select PCI

	help

	help

	  Support for Intel's IXP23xx (XScale) family of processors.

	  Support for Intel's IXP23xx (XScale) family of processors.
@@ -336,14 +331,12 @@ config ARCH_IXP4XX 
	select GENERIC_GPIO

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select HAVE_IDE

	help

	help

	  Support for Intel's IXP4XX (XScale) family of processors.

	  Support for Intel's IXP4XX (XScale) family of processors.





config ARCH_L7200

config ARCH_L7200

	bool "LinkUp-L7200"

	bool "LinkUp-L7200"

	select FIQ

	select FIQ

	select HAVE_IDE

	help

	help

	  Say Y here if you intend to run this kernel on a LinkUp Systems

	  Say Y here if you intend to run this kernel on a LinkUp Systems

	  L7200 Software Development Board which uses an ARM720T processor.

	  L7200 Software Development Board which uses an ARM720T processor.
@@ -400,7 +393,6 @@ config ARCH_PXA 
	depends on MMU

	depends on MMU

	select ARCH_MTD_XIP

	select ARCH_MTD_XIP

	select GENERIC_GPIO

	select GENERIC_GPIO

	select HAVE_IDE

	select HAVE_GPIO_LIB

	select HAVE_GPIO_LIB

	select GENERIC_TIME

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS
@@ -416,7 +408,6 @@ config ARCH_RPC 
	select ARCH_MAY_HAVE_PC_FDC

	select ARCH_MAY_HAVE_PC_FDC

	select ISA_DMA_API

	select ISA_DMA_API

	select NO_IOPORT

	select NO_IOPORT

	select HAVE_IDE

	help

	help

	  On the Acorn Risc-PC, Linux can support the internal IDE disk and

	  On the Acorn Risc-PC, Linux can support the internal IDE disk and

	  CD-ROM interface, serial and parallel port, and the floppy drive.

	  CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -432,7 +423,6 @@ config ARCH_SA1100 
	select GENERIC_TIME

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select TICK_ONESHOT

	select TICK_ONESHOT

	select HAVE_IDE

	select HAVE_GPIO_LIB

	select HAVE_GPIO_LIB

	help

	help

	  Support for StrongARM 11x0 based boards.

	  Support for StrongARM 11x0 based boards.
@@ -440,7 +430,6 @@ config ARCH_SA1100 
config ARCH_S3C2410

config ARCH_S3C2410

	bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"

	bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"

	select GENERIC_GPIO

	select GENERIC_GPIO

	select HAVE_IDE

	help

	help

	  Samsung S3C2410X CPU based systems, such as the Simtec Electronics

	  Samsung S3C2410X CPU based systems, such as the Simtec Electronics

	  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or

	  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@ -448,7 +437,6 @@ config ARCH_S3C2410 




config ARCH_SHARK

config ARCH_SHARK

	bool "Shark"

	bool "Shark"

	select HAVE_IDE

	select ISA

	select ISA

	select ISA_DMA

	select ISA_DMA

	select PCI

	select PCI
@@ -458,7 +446,6 @@ config ARCH_SHARK 




config ARCH_LH7A40X

config ARCH_LH7A40X

	bool "Sharp LH7A40X"

	bool "Sharp LH7A40X"

	select HAVE_IDE

	help

	help

	  Say Y here for systems based on one of the Sharp LH7A40X

	  Say Y here for systems based on one of the Sharp LH7A40X

	  System on a Chip processors.  These CPUs include an ARM922T

	  System on a Chip processors.  These CPUs include an ARM922T

drivers/ide/Kconfig

+0 −34
Original line number Original line Diff line number Diff line
@@ -862,40 +862,6 @@ config BLK_DEV_IDE_BAST 
	  Say Y here if you want to support the onboard IDE channels on the

	  Say Y here if you want to support the onboard IDE channels on the

	  Simtec BAST or the Thorcom VR1000

	  Simtec BAST or the Thorcom VR1000





config ETRAX_IDE

	tristate "ETRAX IDE support"

	depends on CRIS && BROKEN

	select BLK_DEV_IDEDMA

	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

config IDE_H8300

	tristate "H8300 IDE support"

	tristate "H8300 IDE support"

	depends on H8300

	depends on H8300

drivers/ide/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ ifeq ($(CONFIG_BLK_DEV_CMD640), y) 
	obj-y += cmd640-core.o

	obj-y += cmd640-core.o

endif

endif





obj-$(CONFIG_BLK_DEV_IDE)		+= cris/ ppc/

obj-$(CONFIG_BLK_DEV_IDE)		+= ppc/

obj-$(CONFIG_IDE_H8300)			+= h8300/

obj-$(CONFIG_IDE_H8300)			+= h8300/

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

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

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

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

drivers/ide/arm/icside.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -483,7 +483,7 @@ static const struct ide_port_info icside_v6_port_info __initdata = { 
	.init_dma		= icside_dma_off_init,

	.init_dma		= icside_dma_off_init,

	.port_ops		= &icside_v6_no_dma_port_ops,

	.port_ops		= &icside_v6_no_dma_port_ops,

	.dma_ops		= &icside_v6_dma_ops,

	.dma_ops		= &icside_v6_dma_ops,

	.host_flags		= IDE_HFLAG_SERIALIZE,

	.host_flags		= IDE_HFLAG_SERIALIZE | IDE_HFLAG_MMIO,

	.mwdma_mask		= ATA_MWDMA2,

	.mwdma_mask		= ATA_MWDMA2,

	.swdma_mask		= ATA_SWDMA2,

	.swdma_mask		= ATA_SWDMA2,

};

};

drivers/ide/arm/palm_bk3710.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -342,6 +342,7 @@ static const struct ide_port_ops palm_bk3710_ports_ops = { 
static const struct ide_port_info __devinitdata palm_bk3710_port_info = {

static const struct ide_port_info __devinitdata palm_bk3710_port_info = {

	.init_dma		= palm_bk3710_init_dma,

	.init_dma		= palm_bk3710_init_dma,

	.port_ops		= &palm_bk3710_ports_ops,

	.port_ops		= &palm_bk3710_ports_ops,

	.host_flags		= IDE_HFLAG_MMIO,

	.pio_mask		= ATA_PIO4,

	.pio_mask		= ATA_PIO4,

	.udma_mask		= ATA_UDMA4,	/* (input clk 99MHz) */

	.udma_mask		= ATA_UDMA4,	/* (input clk 99MHz) */

	.mwdma_mask		= ATA_MWDMA2,

	.mwdma_mask		= ATA_MWDMA2,