Commit b5684b83 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: (76 commits)
  ide: use proper printk() KERN_* levels in ide-probe.c
  ide: fix for EATA SCSI HBA in ATA emulating mode
  ide: remove stale comments from drivers/ide/Makefile
  ide: enable local IRQs in all handlers for TASKFILE_NO_DATA data phase
  ide-scsi: remove kmalloced struct request
  ht6560b: remove old history
  ht6560b: update email address
  ide-cd: fix oops when using growisofs
  gayle: release resources on ide_host_add() failure
  palm_bk3710: add UltraDMA/100 support
  ide: trivial sparse annotations
  ide: ide-tape.c sparse annotations and unaligned access removal
  ide: drop 'name' parameter from ->init_chipset method
  ide: prefix messages from IDE PCI host drivers by driver name
  it821x: remove DECLARE_ITE_DEV() macro
  it8213: remove DECLARE_ITE_DEV() macro
  ide: include PCI device name in messages from IDE PCI host drivers
  ide: remove <asm/ide.h> for some archs
  ide-generic: remove ide_default_{io_base,irq}() inlines (take 3)
  ide-generic: is no longer needed on ppc32
  ...
parents 1481b910 1b8ebad8

drivers/ide/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ comment "IDE chipset support/bugfixes" 


config IDE_GENERIC

	tristate "generic/default IDE chipset support"

	depends on ALPHA || X86 || IA64 || M32R || MIPS || PPC32

	depends on ALPHA || X86 || IA64 || M32R || MIPS

	help

	  If unsure, say N.

drivers/ide/Makefile

+1 −8
Original line number Diff line number Diff line 
#

# Makefile for the kernel ata, atapi, and ide block device drivers.

#

# 12 September 2000, Bartlomiej Zolnierkiewicz <bkz@linux-ide.org>

# Rewritten to use lists instead of if-statements.

#

# Note : at this point, these files are compiled on all systems.

# In the future, some of these should be built conditionally.

#

# link order is important here

#



EXTRA_CFLAGS				+= -Idrivers/ide

drivers/ide/arm/icside.c

+6 −0
Original line number Diff line number Diff line
@@ -710,8 +710,14 @@ static int __init icside_init(void) 
	return ecard_register_driver(&icside_driver);

}



static void __exit icside_exit(void);

{

	ecard_unregister_driver(&icside_driver);

}



MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("ICS IDE driver");



module_init(icside_init);

module_exit(icside_exit);

drivers/ide/arm/palm_bk3710.c

+6 −3
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ static const struct palm_bk3710_udmatiming palm_bk3710_udmatimings[6] = { 
	{100, 120},		/* UDMA Mode 2 */

	{100, 90},		/* UDMA Mode 3 */

	{100, 60},		/* UDMA Mode 4 */

	{85,  40},		/* UDMA Mode 5 */

};



static void palm_bk3710_setudmamode(void __iomem *base, unsigned int dev,
@@ -334,12 +335,11 @@ static const struct ide_port_ops palm_bk3710_ports_ops = { 
	.cable_detect		= palm_bk3710_cable_detect,

};



static const struct ide_port_info __devinitdata palm_bk3710_port_info = {

static struct ide_port_info __devinitdata palm_bk3710_port_info = {

	.init_dma		= palm_bk3710_init_dma,

	.port_ops		= &palm_bk3710_ports_ops,

	.host_flags		= IDE_HFLAG_MMIO,

	.pio_mask		= ATA_PIO4,

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

	.mwdma_mask		= ATA_MWDMA2,

};
@@ -352,7 +352,7 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev) 
	int i, rc;

	hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };



	clk = clk_get(NULL, "IDECLK");

	clk = clk_get(&pdev->dev, "IDECLK");

	if (IS_ERR(clk))

		return -ENODEV;
@@ -392,6 +392,9 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev) 
	hw.irq = irq->start;

	hw.chipset = ide_palm3710;



	palm_bk3710_port_info.udma_mask = rate < 100000000 ? ATA_UDMA4 :

							     ATA_UDMA5;



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

	if (rc)

		goto out;

drivers/ide/arm/rapide.c

+6 −0
Original line number Diff line number Diff line
@@ -95,7 +95,13 @@ static int __init rapide_init(void) 
	return ecard_register_driver(&rapide_driver);

}



static void __exit rapide_exit(void)

{

	ecard_unregister_driver(&rapide_driver);

}



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Yellowstone RAPIDE driver");



module_init(rapide_init);

module_exit(rapide_exit);

CRA Git | Maintained and supported by SUSTech CRA and CCSE