diff options
| author | Marc Singer <elf@com.rmk.(none)> | 2004-08-13 01:08:22 +0100 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2004-08-13 01:08:22 +0100 |
| commit | 94fd05b430a38d32fb98887cdb5e894d0dbc33e6 (patch) | |
| tree | 8110176129a8f4d6a79311913ee465e14a5bb1dd /include | |
| parent | f94f9db6ee061d1e1976ac009b3641c41f4814f6 (diff) | |
| download | history-94fd05b430a38d32fb98887cdb5e894d0dbc33e6.tar.gz | |
[ARM PATCH] 2001/1: lh7a40x IDE cleanup
Patch from Marc Singer
This patch aligns the lh7a40x port with the updated structure of IDE
drivers. It also removes an unused FIQ handler. This patch is made
in order to get the lh7a40x port to build.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-lh7a40x/ide.h | 69 | ||||
| -rw-r--r-- | include/asm-arm/ide.h | 6 |
2 files changed, 3 insertions, 72 deletions
diff --git a/include/asm-arm/arch-lh7a40x/ide.h b/include/asm-arm/arch-lh7a40x/ide.h deleted file mode 100644 index fb50c0799f6917..00000000000000 --- a/include/asm-arm/arch-lh7a40x/ide.h +++ /dev/null @@ -1,69 +0,0 @@ -/* include/asm-arm/arch-lh7a40x/ide.h - * - * Copyright (C) 2004 Logic Product Development - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - */ - -#ifndef __ASM_ARCH_IDE_H -#define __ASM_ARCH_IDE_H - -#if defined (CONFIG_MACH_LPD7A400) || defined (CONFIG_MACH_LPD7A404) - -/* This implementation of ide.h only applies to the LPD CardEngines. - * Thankfully, there is less to do for the KEV. - */ - -#include <linux/config.h> -#include <asm/irq.h> -#include <asm/hardware.h> -#include <asm/arch/registers.h> - -#define IDE_REG_LINE (1<<12) /* A12 drives !REG */ -#define IDE_ALT_LINE (1<<11) /* Unused A11 allows non-overlapping regions */ -#define IDE_CONTROLREG_OFFSET (0xe) - -void lpd7a40x_hwif_ioops (struct hwif_s* hwif); - -static __inline__ void ide_init_hwif_ports (hw_regs_t *hw, int data_port, - int ctrl_port, int *irq) -{ - ide_ioreg_t reg; - int i; - int regincr = 1; - - memset (hw, 0, sizeof (*hw)); - - reg = (ide_ioreg_t) data_port; - - for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) { - hw->io_ports[i] = reg; - reg += regincr; - } - - hw->io_ports[IDE_CONTROL_OFFSET] = (ide_ioreg_t) ctrl_port; - - if (irq) - *irq = IDE_NO_IRQ; -} - -static __inline__ void ide_init_default_hwifs (void) -{ - hw_regs_t hw; - struct hwif_s* hwif; - - ide_init_hwif_ports (&hw, - CF_VIRT + IDE_REG_LINE, - CF_VIRT + IDE_REG_LINE + IDE_ALT_LINE - + IDE_CONTROLREG_OFFSET, - NULL); - - ide_register_hw (&hw, &hwif); - lpd7a40x_hwif_ioops (hwif); /* Override IO routines */ -} -#endif - -#endif diff --git a/include/asm-arm/ide.h b/include/asm-arm/ide.h index b2b9b3da6c3173..cf9b1b35f8e786 100644 --- a/include/asm-arm/ide.h +++ b/include/asm-arm/ide.h @@ -17,18 +17,18 @@ #define MAX_HWIFS 4 #endif -#if defined(CONFIG_ARCH_LH7A40X) || defined(CONFIG_ARCH_SA1100) +#if defined(CONFIG_ARCH_SA1100) # include <asm/arch/ide.h> /* obsolete + broken */ #endif -#if !defined(CONFIG_ARCH_L7200) && !defined(CONFIG_ARCH_LH7A40X) +#if !defined(CONFIG_ARCH_L7200) # define IDE_ARCH_OBSOLETE_INIT # ifdef CONFIG_ARCH_CLPS7500 # define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */ # else # define ide_default_io_ctl(base) (0) # endif -#endif /* !ARCH_L7200 && !ARCH_LH7A40X */ +#endif /* !ARCH_L7200 */ #define __ide_mm_insw(port,addr,len) readsw(port,addr,len) #define __ide_mm_insl(port,addr,len) readsl(port,addr,len) |