diff options
author | Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> | 2010-10-18 17:41:29 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-21 09:53:45 -0500 |
commit | fa87672ab30ce6564393778b8cbc67fc32712a30 (patch) | |
tree | 50551c8763a12f37ef483055aa0e53b4f894776a /arch/arm/mach-sa1100 | |
parent | 17b38ebb6a32250a220d6af77293f7e3f9c62a6e (diff) |
ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support.
This patch adds nanoEngine PCMCIA support, with support for two sockets.
In order to have a fully functional pcmcia subsystem in a BSE
nanoEngine board you should carefully read this:
http://cambuca.ldhs.cetuc.puc-rio.br/nanoengine/
Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100')
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/nanoengine.h | 30 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/nanoengine.c | 2 |
2 files changed, 31 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/nanoengine.h b/arch/arm/mach-sa1100/include/mach/nanoengine.h new file mode 100644 index 000000000000..053776645526 --- /dev/null +++ b/arch/arm/mach-sa1100/include/mach/nanoengine.h | |||
@@ -0,0 +1,30 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-sa1100/include/mach/nanoengine.h | ||
3 | * | ||
4 | * This file contains the hardware specific definitions for nanoEngine. | ||
5 | * Only include this file from SA1100-specific files. | ||
6 | * | ||
7 | * Copyright (C) 2010 Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | * | ||
13 | */ | ||
14 | #ifndef __ASM_ARCH_NANOENGINE_H | ||
15 | #define __ASM_ARCH_NANOENGINE_H | ||
16 | |||
17 | #define GPIO_PC_READY0 GPIO_GPIO(11) /* ready for socket 0 (active high)*/ | ||
18 | #define GPIO_PC_READY1 GPIO_GPIO(12) /* ready for socket 1 (active high) */ | ||
19 | #define GPIO_PC_CD0 GPIO_GPIO(13) /* detect for socket 0 (active low) */ | ||
20 | #define GPIO_PC_CD1 GPIO_GPIO(14) /* detect for socket 1 (active low) */ | ||
21 | #define GPIO_PC_RESET0 GPIO_GPIO(15) /* reset socket 0 */ | ||
22 | #define GPIO_PC_RESET1 GPIO_GPIO(16) /* reset socket 1 */ | ||
23 | |||
24 | #define NANOENGINE_IRQ_GPIO_PC_READY0 IRQ_GPIO11 | ||
25 | #define NANOENGINE_IRQ_GPIO_PC_READY1 IRQ_GPIO12 | ||
26 | #define NANOENGINE_IRQ_GPIO_PC_CD0 IRQ_GPIO13 | ||
27 | #define NANOENGINE_IRQ_GPIO_PC_CD1 IRQ_GPIO14 | ||
28 | |||
29 | #endif | ||
30 | |||
diff --git a/arch/arm/mach-sa1100/nanoengine.c b/arch/arm/mach-sa1100/nanoengine.c index e4a03099e2a3..844ec61415a7 100644 --- a/arch/arm/mach-sa1100/nanoengine.c +++ b/arch/arm/mach-sa1100/nanoengine.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Bright Star Engineering's nanoEngine board init code. | 4 | * Bright Star Engineering's nanoEngine board init code. |
5 | * | 5 | * |
6 | * Copyright (C) 2009 Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> | 6 | * Copyright (C) 2010 Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> |
7 | * | 7 | * |
8 | * This program is free software; you can redistribute it and/or modify | 8 | * This program is free software; you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License version 2 as | 9 | * it under the terms of the GNU General Public License version 2 as |