aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/arm/ide_arm.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-26 14:13:06 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-26 14:13:06 -0500
commit8ac4ce742c66100931b6f2d7a36b0df08bc721fe (patch)
treebc44edb8d6ec9057d24aa4c986729e1ca9f3f860 /drivers/ide/arm/ide_arm.c
parentac87e41116c229fc1efaac0d17fdbfb2185e4629 (diff)
ide: fix host drivers depending on ide_generic to probe for interfaces (take 2)
* Add mpc8xx_ide_probe() to mpc8xx.c and call it from probe_for_hwifs(). * Convert ide_arm, ide-cris, ide-h8300, ide-pnp, buddha, falconide, gayle, macide, q40ide, cmd640 and mpc8xx host drivers to use ide_device_add(). This removes dependency on ide_generic for these drivers so update ide/Kconfig accordingly. v2: * ide_arm build fix (s/ide_device_idx/ide_device_add/) (Thanks to Christoph Lameter <clameter@sgi.com> for reporting the problem). Cc: Mikael Starvik <starvik@axis.com> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/arm/ide_arm.c')
-rw-r--r--drivers/ide/arm/ide_arm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index 21ba6ac2f826..a1b5ddab6a48 100644
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -28,6 +28,7 @@ void __init ide_arm_init(void)
28{ 28{
29 ide_hwif_t *hwif; 29 ide_hwif_t *hwif;
30 hw_regs_t hw; 30 hw_regs_t hw;
31 u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
31 32
32 memset(&hw, 0, sizeof(hw)); 33 memset(&hw, 0, sizeof(hw));
33 ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206); 34 ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206);
@@ -36,5 +37,8 @@ void __init ide_arm_init(void)
36 hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]); 37 hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
37 if (hwif) { 38 if (hwif) {
38 ide_init_port_hw(hwif, &hw); 39 ide_init_port_hw(hwif, &hw);
40 idx[0] = hwif->index;
41
42 ide_device_add(idx);
39 } 43 }
40} 44}