aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/arm/ide_arm.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/arm/ide_arm.c')
-rw-r--r--drivers/ide/arm/ide_arm.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index a3d6744e870a..bce2bec81413 100644
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * ARM/ARM26 default IDE host driver 2 * ARM default IDE host driver
3 * 3 *
4 * Copyright (C) 2004 Bartlomiej Zolnierkiewicz 4 * Copyright (C) 2004 Bartlomiej Zolnierkiewicz
5 * Based on code by: Russell King, Ian Molton and Alexander Schulz. 5 * Based on code by: Russell King, Ian Molton and Alexander Schulz.
@@ -14,12 +14,6 @@
14#include <asm/mach-types.h> 14#include <asm/mach-types.h>
15#include <asm/irq.h> 15#include <asm/irq.h>
16 16
17#ifdef CONFIG_ARM26
18# define IDE_ARM_HOST (machine_is_a5k())
19#else
20# define IDE_ARM_HOST (1)
21#endif
22
23#ifdef CONFIG_ARCH_CLPS7500 17#ifdef CONFIG_ARCH_CLPS7500
24# include <asm/arch/hardware.h> 18# include <asm/arch/hardware.h>
25# 19#
@@ -32,12 +26,10 @@
32 26
33void __init ide_arm_init(void) 27void __init ide_arm_init(void)
34{ 28{
35 if (IDE_ARM_HOST) { 29 hw_regs_t hw;
36 hw_regs_t hw;
37 30
38 memset(&hw, 0, sizeof(hw)); 31 memset(&hw, 0, sizeof(hw));
39 ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206); 32 ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206);
40 hw.irq = IDE_ARM_IRQ; 33 hw.irq = IDE_ARM_IRQ;
41 ide_register_hw(&hw, 1, NULL); 34 ide_register_hw(&hw, 1, NULL);
42 }
43} 35}