IDE fixes

PATCH New Bartlomiej Zolnierkiewicz 1 participant 1 message Jun 30, 2008 libata

lore

Share & tools

lore

Bartlomiej Zolnierkiewicz

author

2008-06-30 18:20 UTC #0 lore raw

PATCH 1/1 IDE fixes

Hi,

* bast-ide removal was premature, bring it back
(thanks to Russell King for noticing it)

* /proc/ide/ide?/mate needs a "warm-plug compliance" fix

Linus, please pull from:

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

to receive the following updates:

 drivers/ide/Kconfig        |    7 +++
 drivers/ide/arm/Makefile   |    1 +
 drivers/ide/arm/bast-ide.c |   90 ++++++++++++++++++++++++++++++++++++++++++++
 drivers/ide/ide-proc.c     |    2 +-
 4 files changed, 99 insertions(+), 1 deletions(-)
 create mode 100644 drivers/ide/arm/bast-ide.c

Bartlomiej Zolnierkiewicz (2):
Revert "BAST: Remove old IDE driver"
ide: fix /proc/ide/ide?/mate reporting

drivers/ide/Kconfig +7 -0

index 8e07de2..1607536 100644
@@ -823,6 +823,13 @@ config BLK_DEV_IDE_RAPIDE
 	  Say Y here if you want to support the Yellowstone RapIDE controller
 	  manufactured for use with Acorn computers.
 
+config BLK_DEV_IDE_BAST
+	tristate "Simtec BAST / Thorcom VR1000 IDE support"
+	depends on ARM && (ARCH_BAST || MACH_VR1000)
+	help
+	  Say Y here if you want to support the onboard IDE channels on the
+	  Simtec BAST or the Thorcom VR1000
+
 config IDE_H8300
 	tristate "H8300 IDE support"
 	depends on H8300

drivers/ide/arm/Makefile +1 -0

index 5bc2605..936e7b0 100644
@@ -1,6 +1,7 @@
 
 obj-$(CONFIG_BLK_DEV_IDE_ICSIDE)	+= icside.o
 obj-$(CONFIG_BLK_DEV_IDE_RAPIDE)	+= rapide.o
+obj-$(CONFIG_BLK_DEV_IDE_BAST)		+= bast-ide.o
 obj-$(CONFIG_BLK_DEV_PALMCHIP_BK3710)	+= palm_bk3710.o
 
 ifeq ($(CONFIG_IDE_ARM), m)

drivers/ide/arm/bast-ide.c new file +90 -0

90 lines not on this page · raw message

drivers/ide/ide-proc.c +1 -1

index 55ec7f7..8af88bf 100644
@@ -76,7 +76,7 @@ static int proc_ide_read_mate
 	ide_hwif_t	*hwif = (ide_hwif_t *) data;
 	int		len;
 
-	if (hwif && hwif->mate && hwif->mate->present)
+	if (hwif && hwif->mate)
 		len = sprintf(page, "%s\n", hwif->mate->name);
 	else
 		len = sprintf(page, "(none)\n");