diff options
author | Manuel Lauss <manuel.lauss@googlemail.com> | 2009-10-04 08:55:28 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2010-02-27 06:52:51 -0500 |
commit | 27dd65ac9afabc8e67ab73f7c2f575eddbb47167 (patch) | |
tree | d8da508ceff4f2e69f8cc621a8bdebe83fef02e8 /arch/mips/include | |
parent | 66213b3ccfc770704025ce9465fa3aaedde21b55 (diff) |
MIPS: Alchemy: devboards: wire up new PCMCIA driver.
Register the PCMCIA driver on all boards supported by it,
get rid of now-unused pcmcia macros in the board headers
(and subsequently empty pb1100/pb1500 ones).
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/include')
-rw-r--r-- | arch/mips/include/asm/mach-db1x00/db1200.h | 15 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-db1x00/db1x00.h | 8 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-pb1x00/pb1100.h | 36 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-pb1x00/pb1200.h | 14 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-pb1x00/pb1500.h | 36 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-pb1x00/pb1550.h | 7 |
6 files changed, 0 insertions, 116 deletions
diff --git a/arch/mips/include/asm/mach-db1x00/db1200.h b/arch/mips/include/asm/mach-db1x00/db1200.h index b7f18e1af50..52b1d84a92c 100644 --- a/arch/mips/include/asm/mach-db1x00/db1200.h +++ b/arch/mips/include/asm/mach-db1x00/db1200.h | |||
@@ -103,21 +103,6 @@ enum external_pb1200_ints { | |||
103 | DB1200_INT_END = DB1200_INT_BEGIN + 15, | 103 | DB1200_INT_END = DB1200_INT_BEGIN + 15, |
104 | }; | 104 | }; |
105 | 105 | ||
106 | |||
107 | /* | ||
108 | * DBAu1200 specific PCMCIA defines for drivers/pcmcia/au1000_db1x00.c | ||
109 | */ | ||
110 | #define PCMCIA_MAX_SOCK 1 | ||
111 | #define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK + 1) | ||
112 | |||
113 | /* VPP/VCC */ | ||
114 | #define SET_VCC_VPP(VCC, VPP, SLOT) \ | ||
115 | ((((VCC) << 2) | ((VPP) << 0)) << ((SLOT) * 8)) | ||
116 | |||
117 | #define BOARD_PC0_INT DB1200_PC0_INT | ||
118 | #define BOARD_PC1_INT DB1200_PC1_INT | ||
119 | #define BOARD_CARD_INSERTED(SOCKET) (bcsr_read(BCSR_SIGSTAT) & (1 << (8 + (2 * SOCKET)))) | ||
120 | |||
121 | /* NAND chip select */ | 106 | /* NAND chip select */ |
122 | #define NAND_CS 1 | 107 | #define NAND_CS 1 |
123 | 108 | ||
diff --git a/arch/mips/include/asm/mach-db1x00/db1x00.h b/arch/mips/include/asm/mach-db1x00/db1x00.h index cfa64297da0..a919dac525a 100644 --- a/arch/mips/include/asm/mach-db1x00/db1x00.h +++ b/arch/mips/include/asm/mach-db1x00/db1x00.h | |||
@@ -45,14 +45,6 @@ | |||
45 | 45 | ||
46 | #endif | 46 | #endif |
47 | 47 | ||
48 | /* PCMCIA DBAu1x00 specific defines */ | ||
49 | #define PCMCIA_MAX_SOCK 1 | ||
50 | #define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK + 1) | ||
51 | |||
52 | /* VPP/VCC */ | ||
53 | #define SET_VCC_VPP(VCC, VPP, SLOT)\ | ||
54 | ((((VCC) << 2) | ((VPP) << 0)) << ((SLOT) * 8)) | ||
55 | |||
56 | /* | 48 | /* |
57 | * NAND defines | 49 | * NAND defines |
58 | * | 50 | * |
diff --git a/arch/mips/include/asm/mach-pb1x00/pb1100.h b/arch/mips/include/asm/mach-pb1x00/pb1100.h deleted file mode 100644 index f2bf73a11fb..00000000000 --- a/arch/mips/include/asm/mach-pb1x00/pb1100.h +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | /* | ||
2 | * Alchemy Semi Pb1100 Referrence Board | ||
3 | * | ||
4 | * Copyright 2001, 2008 MontaVista Software Inc. | ||
5 | * Author: MontaVista Software, Inc. <source@mvista.com> | ||
6 | * | ||
7 | * ######################################################################## | ||
8 | * | ||
9 | * This program is free software; you can distribute it and/or modify it | ||
10 | * under the terms of the GNU General Public License (Version 2) as | ||
11 | * published by the Free Software Foundation. | ||
12 | * | ||
13 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
14 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
15 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
16 | * for more details. | ||
17 | * | ||
18 | * You should have received a copy of the GNU General Public License along | ||
19 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
20 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | ||
21 | * | ||
22 | * ######################################################################## | ||
23 | * | ||
24 | * | ||
25 | */ | ||
26 | #ifndef __ASM_PB1100_H | ||
27 | #define __ASM_PB1100_H | ||
28 | |||
29 | /* PCMCIA Pb1100 specific defines */ | ||
30 | #define PCMCIA_MAX_SOCK 0 | ||
31 | #define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK + 1) | ||
32 | |||
33 | /* VPP/VCC */ | ||
34 | #define SET_VCC_VPP(VCC, VPP) (((VCC) << 2) | ((VPP) << 0)) | ||
35 | |||
36 | #endif /* __ASM_PB1100_H */ | ||
diff --git a/arch/mips/include/asm/mach-pb1x00/pb1200.h b/arch/mips/include/asm/mach-pb1x00/pb1200.h index 2458eb436a0..962eb55dc88 100644 --- a/arch/mips/include/asm/mach-pb1x00/pb1200.h +++ b/arch/mips/include/asm/mach-pb1x00/pb1200.h | |||
@@ -135,20 +135,6 @@ enum external_pb1200_ints { | |||
135 | PB1200_INT_END = PB1200_INT_BEGIN + 15 | 135 | PB1200_INT_END = PB1200_INT_BEGIN + 15 |
136 | }; | 136 | }; |
137 | 137 | ||
138 | /* | ||
139 | * Pb1200 specific PCMCIA defines for drivers/pcmcia/au1000_db1x00.c | ||
140 | */ | ||
141 | #define PCMCIA_MAX_SOCK 1 | ||
142 | #define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK + 1) | ||
143 | |||
144 | /* VPP/VCC */ | ||
145 | #define SET_VCC_VPP(VCC, VPP, SLOT) \ | ||
146 | ((((VCC) << 2) | ((VPP) << 0)) << ((SLOT) * 8)) | ||
147 | |||
148 | #define BOARD_PC0_INT PB1200_PC0_INT | ||
149 | #define BOARD_PC1_INT PB1200_PC1_INT | ||
150 | #define BOARD_CARD_INSERTED(SOCKET) (bcsr_read(BCSR_SIGSTAT & (1 << (8 + (2 * SOCKET)))) | ||
151 | |||
152 | /* NAND chip select */ | 138 | /* NAND chip select */ |
153 | #define NAND_CS 1 | 139 | #define NAND_CS 1 |
154 | 140 | ||
diff --git a/arch/mips/include/asm/mach-pb1x00/pb1500.h b/arch/mips/include/asm/mach-pb1x00/pb1500.h deleted file mode 100644 index 82431a7ab94..00000000000 --- a/arch/mips/include/asm/mach-pb1x00/pb1500.h +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | /* | ||
2 | * Alchemy Semi Pb1500 Referrence Board | ||
3 | * | ||
4 | * Copyright 2001, 2008 MontaVista Software Inc. | ||
5 | * Author: MontaVista Software, Inc. <source@mvista.com> | ||
6 | * | ||
7 | * ######################################################################## | ||
8 | * | ||
9 | * This program is free software; you can distribute it and/or modify it | ||
10 | * under the terms of the GNU General Public License (Version 2) as | ||
11 | * published by the Free Software Foundation. | ||
12 | * | ||
13 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
14 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
15 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
16 | * for more details. | ||
17 | * | ||
18 | * You should have received a copy of the GNU General Public License along | ||
19 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
20 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | ||
21 | * | ||
22 | * ######################################################################## | ||
23 | * | ||
24 | * | ||
25 | */ | ||
26 | #ifndef __ASM_PB1500_H | ||
27 | #define __ASM_PB1500_H | ||
28 | |||
29 | /* PCMCIA Pb1500 specific defines */ | ||
30 | #define PCMCIA_MAX_SOCK 0 | ||
31 | #define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK + 1) | ||
32 | |||
33 | /* VPP/VCC */ | ||
34 | #define SET_VCC_VPP(VCC, VPP) (((VCC) << 2) | ((VPP) << 0)) | ||
35 | |||
36 | #endif /* __ASM_PB1500_H */ | ||
diff --git a/arch/mips/include/asm/mach-pb1x00/pb1550.h b/arch/mips/include/asm/mach-pb1x00/pb1550.h index 306d584abbd..58796410bd6 100644 --- a/arch/mips/include/asm/mach-pb1x00/pb1550.h +++ b/arch/mips/include/asm/mach-pb1x00/pb1550.h | |||
@@ -40,13 +40,6 @@ | |||
40 | #define SMBUS_PSC_BASE PSC2_BASE_ADDR | 40 | #define SMBUS_PSC_BASE PSC2_BASE_ADDR |
41 | #define I2S_PSC_BASE PSC3_BASE_ADDR | 41 | #define I2S_PSC_BASE PSC3_BASE_ADDR |
42 | 42 | ||
43 | #define PCMCIA_MAX_SOCK 1 | ||
44 | #define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK + 1) | ||
45 | |||
46 | /* VPP/VCC */ | ||
47 | #define SET_VCC_VPP(VCC, VPP, SLOT) \ | ||
48 | ((((VCC) << 2) | ((VPP) << 0)) << ((SLOT) * 8)) | ||
49 | |||
50 | #if defined(CONFIG_MTD_PB1550_BOOT) && defined(CONFIG_MTD_PB1550_USER) | 43 | #if defined(CONFIG_MTD_PB1550_BOOT) && defined(CONFIG_MTD_PB1550_USER) |
51 | #define PB1550_BOTH_BANKS | 44 | #define PB1550_BOTH_BANKS |
52 | #elif defined(CONFIG_MTD_PB1550_BOOT) && !defined(CONFIG_MTD_PB1550_USER) | 45 | #elif defined(CONFIG_MTD_PB1550_BOOT) && !defined(CONFIG_MTD_PB1550_USER) |