aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/include
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2009-03-23 02:04:17 +0100
committerEric Miao <eric.miao@marvell.com>2009-03-23 09:59:04 +0800
commitacb3655973de30cb74549986e5e118a374967702 (patch)
tree3ed765a1498c77c0dca59b0a2f82de1a96d1a5c7 /arch/arm/mach-pxa/include
parent626806d96fcfe355af5e1d299f651c774f68ead0 (diff)
[ARM] pxa: Refactor Colibri board support code
- Move common function for all Colibri PXA3xx boards to the newly added colibri-pxa3xx.c - Drop some unnecessary defines from colibri.h - Make Kconfig reflect the fact that code for colibri 300 module does also work for the 310 model - Give up on the huge pin config table which was messed up with lots of #ifdefs and switch over to locally defined tables for configured functions Cc: Matthias Meier <matthias.j.meier@gmx.net> Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/include')
-rw-r--r--arch/arm/mach-pxa/include/mach/colibri.h18
1 files changed, 6 insertions, 12 deletions
diff --git a/arch/arm/mach-pxa/include/mach/colibri.h b/arch/arm/mach-pxa/include/mach/colibri.h
index e295e8df8d6..0becf6215c1 100644
--- a/arch/arm/mach-pxa/include/mach/colibri.h
+++ b/arch/arm/mach-pxa/include/mach/colibri.h
@@ -4,6 +4,12 @@
* common settings for all modules
*/
+#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)
+extern void colibri_pxa3xx_init_mmc(mfp_cfg_t *pins, int len, int detect_pin);
+#else
+static inline void colibri_pxa3xx_init_mmc(mfp_cfg_t *, int, int) {}
+#endif
+
/* physical memory regions */
#define COLIBRI_SDRAM_BASE 0xa0000000 /* SDRAM region */
@@ -15,17 +21,5 @@
#define COLIBRI_PXA270_ETH_IRQ \
gpio_to_irq(mfp_to_gpio(COLIBRI_PXA270_ETH_IRQ_GPIO))
-/* definitions for Colibri PXA300 */
-
-#define COLIBRI_PXA300_ETH_IRQ_GPIO 26
-#define COLIBRI_PXA300_ETH_IRQ \
- gpio_to_irq(mfp_to_gpio(COLIBRI_PXA300_ETH_IRQ_GPIO))
-
-/* definitions for Colibri PXA320 */
-
-#define COLIBRI_PXA320_ETH_IRQ_GPIO 36
-#define COLIBRI_PXA320_ETH_IRQ \
- gpio_to_irq(mfp_to_gpio(COLIBRI_PXA320_ETH_IRQ_GPIO))
-
#endif /* _COLIBRI_H_ */