diff options
| author | Nicolas Pitre <nico@org.rmk.(none)> | 2003-10-04 23:59:41 +0100 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2003-10-04 23:59:41 +0100 |
| commit | d24e45f896fe957e3dbaebf61382473d3259fb66 (patch) | |
| tree | 80edf366d99ee279c852a59cdb593ee597491367 /include/asm-arm | |
| parent | 162c65f28572fcee72021acec66e33947c2d71db (diff) | |
[ARM PATCH] 1660/1: misc PXA/Lubbock fixes
Patch from Nicolas Pitre
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/arch-pxa/irqs.h | 8 | ||||
| -rw-r--r-- | include/asm-arm/arch-pxa/lubbock.h | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/asm-arm/arch-pxa/irqs.h b/include/asm-arm/arch-pxa/irqs.h index 6d452434eabc..170dcf464459 100644 --- a/include/asm-arm/arch-pxa/irqs.h +++ b/include/asm-arm/arch-pxa/irqs.h @@ -11,7 +11,7 @@ */ #define PXA_IRQ_SKIP 7 /* The first 7 IRQs are not yet used */ -#define PXA_IRQ(x) ((x) - PXA_IRQ_SKIP) +#define PXA_IRQ(x) ((x) - PXA_IRQ_SKIP) #define IRQ_HWUART PXA_IRQ(7) /* HWUART Transmit/Receive/Error */ #define IRQ_GPIO0 PXA_IRQ(8) /* GPIO0 Edge Detect */ @@ -45,7 +45,7 @@ #define IRQ_TO_GPIO_2_80(i) \ ((i) - PXA_IRQ(32) + 2) -#define IRQ_TO_GPIO(i) ((i) - (((i) > IRQ_GPIO1) ? IRQ_GPIO(2) : IRQ_GPIO(0))) +#define IRQ_TO_GPIO(i) ((i) - (((i) > IRQ_GPIO1) ? IRQ_GPIO(2) - 2 : IRQ_GPIO(0))) /* * The next 16 interrupts are for board specific purposes. Since @@ -129,8 +129,10 @@ #define LUBBOCK_IRQ(x) (IRQ_BOARD_START + (x)) #define LUBBOCK_SD_IRQ LUBBOCK_IRQ(0) #define LUBBOCK_SA1111_IRQ LUBBOCK_IRQ(1) -#define LUBBOCK_USB_IRQ LUBBOCK_IRQ(2) +#define LUBBOCK_USB_IRQ LUBBOCK_IRQ(2) /* usb connect */ #define LUBBOCK_ETH_IRQ LUBBOCK_IRQ(3) #define LUBBOCK_UCB1400_IRQ LUBBOCK_IRQ(4) #define LUBBOCK_BB_IRQ LUBBOCK_IRQ(5) +#define LUBBOCK_USB_DISC_IRQ LUBBOCK_IRQ(6) /* usb disconnect */ +#define LUBBOCK_LAST_IRQ LUBBOCK_IRQ(6) diff --git a/include/asm-arm/arch-pxa/lubbock.h b/include/asm-arm/arch-pxa/lubbock.h index 1ff2872cb5b1..b6244d2521a8 100644 --- a/include/asm-arm/arch-pxa/lubbock.h +++ b/include/asm-arm/arch-pxa/lubbock.h @@ -12,7 +12,8 @@ #define LUBBOCK_FPGA_PHYS PXA_CS2_PHYS #define LUBBOCK_FPGA_VIRT (0xf0000000) /* phys 0x08000000 */ -#define LUBBOCK_ETH_BASE (0xf1000000) /* phys 0x0c000000 */ +#define LUBBOCK_ETH_PHYS PXA_CS3_PHYS +#define LUBBOCK_ETH_VIRT (0xf1000000) #define LUB_P2V(x) ((x) - LUBBOCK_FPGA_PHYS + LUBBOCK_FPGA_VIRT) #define LUB_V2P(x) ((x) - LUBBOCK_FPGA_VIRT + LUBBOCK_FPGA_PHYS) |