diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2002-05-07 21:51:39 +0100 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2002-05-07 21:51:39 +0100 |
| commit | 467fea09482c9f21a71733275127ba18d22edf62 (patch) | |
| tree | 2176e66507fda1af14355c41d63a9271e0ea00a7 /include | |
| parent | 64f841a58c8c039214e927cbf0c207a674c499fc (diff) | |
[ARM] SA1100 cleanups:
- Only map Neponset if Neponset is present.
- Remove IRQ debugging
- Move GPIO_11_27_IRQ macro
- Supply CS macros to define physical addresses.
- Remove defunct PCMCIA base addresses definitions.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-sa1100/SA-1100.h | 10 | ||||
| -rw-r--r-- | include/asm-arm/arch-sa1100/hardware.h | 9 | ||||
| -rw-r--r-- | include/asm-arm/arch-sa1100/irqs.h | 5 |
3 files changed, 10 insertions, 14 deletions
diff --git a/include/asm-arm/arch-sa1100/SA-1100.h b/include/asm-arm/arch-sa1100/SA-1100.h index 22d38d4f9276..62aaf04a3906 100644 --- a/include/asm-arm/arch-sa1100/SA-1100.h +++ b/include/asm-arm/arch-sa1100/SA-1100.h @@ -22,6 +22,16 @@ #include "bitfield.h" +/* + * SA1100 CS line to physical address + */ + +#define SA1100_CS0_PHYS 0x00000000 +#define SA1100_CS1_PHYS 0x08000000 +#define SA1100_CS2_PHYS 0x10000000 +#define SA1100_CS3_PHYS 0x18000000 +#define SA1100_CS4_PHYS 0x40000000 +#define SA1100_CS5_PHYS 0x48000000 /* * Personal Computer Memory Card International Association (PCMCIA) sockets diff --git a/include/asm-arm/arch-sa1100/hardware.h b/include/asm-arm/arch-sa1100/hardware.h index af9ce59b8ab2..f12446570ffd 100644 --- a/include/asm-arm/arch-sa1100/hardware.h +++ b/include/asm-arm/arch-sa1100/hardware.h @@ -24,15 +24,6 @@ /* - * Those are statically mapped PCMCIA IO space for designs using it as a - * generic IO bus, typically with ISA parts, hardwired IDE interfaces, etc. - * The actual PCMCIA code is mapping required IO region at run time. - */ -#define PCMCIA_IO_0_BASE 0xf6000000 -#define PCMCIA_IO_1_BASE 0xf7000000 - - -/* * We requires absolute addresses i.e. (PCMCIA_IO_0_BASE + 0x3f8) for * in*()/out*() macros to be usable for all cases. */ diff --git a/include/asm-arm/arch-sa1100/irqs.h b/include/asm-arm/arch-sa1100/irqs.h index d8caa5c836b4..d4ba9b21f404 100644 --- a/include/asm-arm/arch-sa1100/irqs.h +++ b/include/asm-arm/arch-sa1100/irqs.h @@ -61,11 +61,6 @@ #define IRQ_GPIO27 48 /* - * To get the GPIO number from an IRQ number - */ -#define GPIO_11_27_IRQ(i) ((i) - 21) - -/* * The next 16 interrupts are for board specific purposes. Since * the kernel can only run on one machine at a time, we can re-use * these. If you need more, increase IRQ_BOARD_END, but keep it |