diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:33:32 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:33:32 -0500 |
| commit | 404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34 (patch) | |
| tree | 99119edc53fdca73ed7586829b8ee736e09440b3 /arch/arm/mach-ux500/board-mop500.h | |
| parent | 28cdac6690cb113856293bf79b40de33dbd8f974 (diff) | |
| parent | 1051b9f0f9eab8091fe3bf98320741adf36b4cfa (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/mach-pxa/clock.c
arch/arm/mach-pxa/clock.h
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.h')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index 2d240322fa6f..3104ae2a02c2 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h | |||
| @@ -7,6 +7,15 @@ | |||
| 7 | #ifndef __BOARD_MOP500_H | 7 | #ifndef __BOARD_MOP500_H |
| 8 | #define __BOARD_MOP500_H | 8 | #define __BOARD_MOP500_H |
| 9 | 9 | ||
| 10 | #define MOP500_EGPIO(x) (NOMADIK_NR_GPIO + (x)) | ||
| 11 | |||
| 12 | /* GPIOs on the TC35892 expander */ | ||
| 13 | #define GPIO_SDMMC_CD MOP500_EGPIO(3) | ||
| 14 | #define GPIO_SDMMC_EN MOP500_EGPIO(17) | ||
| 15 | #define GPIO_SDMMC_1V8_3V_SEL MOP500_EGPIO(18) | ||
| 16 | |||
| 10 | extern void mop500_sdi_init(void); | 17 | extern void mop500_sdi_init(void); |
| 18 | extern void mop500_sdi_tc35892_init(void); | ||
| 19 | extern void mop500_keypad_init(void); | ||
| 11 | 20 | ||
| 12 | #endif | 21 | #endif |