diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-09 16:34:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-09 16:34:25 -0400 |
| commit | f974a8ec96571535ee07880a023bcce0e3f2c76b (patch) | |
| tree | 5cf09207b1ad292a55275cd0b24999fa29b9dfe8 /include/asm-arm/arch-pxa/pxa2xx-gpio.h | |
| parent | c0b8556f2f8146bd38324b14b1ce00f249ba8ed9 (diff) | |
| parent | 4ed47896935573c8423d05bddda3f269d6e6c613 (diff) | |
Merge branch 'machtypes' into pxa-palm
Diffstat (limited to 'include/asm-arm/arch-pxa/pxa2xx-gpio.h')
| -rw-r--r-- | include/asm-arm/arch-pxa/pxa2xx-gpio.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/pxa2xx-gpio.h b/include/asm-arm/arch-pxa/pxa2xx-gpio.h index a6e60f691617..6ef1dd09970b 100644 --- a/include/asm-arm/arch-pxa/pxa2xx-gpio.h +++ b/include/asm-arm/arch-pxa/pxa2xx-gpio.h | |||
| @@ -136,7 +136,11 @@ | |||
| 136 | #define GPIO93_CIF_DD_6 93 /* Camera data pin 6 */ | 136 | #define GPIO93_CIF_DD_6 93 /* Camera data pin 6 */ |
| 137 | #define GPIO94_CIF_DD_5 94 /* Camera data pin 5 */ | 137 | #define GPIO94_CIF_DD_5 94 /* Camera data pin 5 */ |
| 138 | #define GPIO95_CIF_DD_4 95 /* Camera data pin 4 */ | 138 | #define GPIO95_CIF_DD_4 95 /* Camera data pin 4 */ |
| 139 | #define GPIO96_FFRXD 96 /* FFUART recieve */ | ||
| 140 | #define GPIO98_FFRTS 98 /* FFUART request to send */ | ||
| 139 | #define GPIO98_CIF_DD_0 98 /* Camera data pin 0 */ | 141 | #define GPIO98_CIF_DD_0 98 /* Camera data pin 0 */ |
| 142 | #define GPIO99_FFTXD 99 /* FFUART transmit data */ | ||
| 143 | #define GPIO100_FFCTS 100 /* FFUART Clear to send */ | ||
| 140 | #define GPIO102_nPCE_1 102 /* PCMCIA (PXA27x) */ | 144 | #define GPIO102_nPCE_1 102 /* PCMCIA (PXA27x) */ |
| 141 | #define GPIO103_CIF_DD_3 103 /* Camera data pin 3 */ | 145 | #define GPIO103_CIF_DD_3 103 /* Camera data pin 3 */ |
| 142 | #define GPIO104_CIF_DD_2 104 /* Camera data pin 2 */ | 146 | #define GPIO104_CIF_DD_2 104 /* Camera data pin 2 */ |
| @@ -318,6 +322,8 @@ | |||
| 318 | #define GPIO85_nPCE_1_MD (85 | GPIO_ALT_FN_1_OUT) | 322 | #define GPIO85_nPCE_1_MD (85 | GPIO_ALT_FN_1_OUT) |
| 319 | #define GPIO85_CIF_LV_MD (85 | GPIO_ALT_FN_3_IN) | 323 | #define GPIO85_CIF_LV_MD (85 | GPIO_ALT_FN_3_IN) |
| 320 | #define GPIO86_nPCE_1_MD (86 | GPIO_ALT_FN_1_OUT) | 324 | #define GPIO86_nPCE_1_MD (86 | GPIO_ALT_FN_1_OUT) |
| 325 | #define GPIO88_USBH1_PWR_MD (88 | GPIO_ALT_FN_1_IN) | ||
| 326 | #define GPIO89_USBH1_PEN_MD (89 | GPIO_ALT_FN_2_OUT) | ||
| 321 | #define GPIO90_CIF_DD_4_MD (90 | GPIO_ALT_FN_3_IN) | 327 | #define GPIO90_CIF_DD_4_MD (90 | GPIO_ALT_FN_3_IN) |
| 322 | #define GPIO91_CIF_DD_5_MD (91 | GPIO_ALT_FN_3_IN) | 328 | #define GPIO91_CIF_DD_5_MD (91 | GPIO_ALT_FN_3_IN) |
| 323 | #define GPIO92_MMCDAT0_MD (92 | GPIO_ALT_FN_1_OUT) | 329 | #define GPIO92_MMCDAT0_MD (92 | GPIO_ALT_FN_1_OUT) |
| @@ -326,8 +332,11 @@ | |||
| 326 | #define GPIO95_CIF_DD_4_MD (95 | GPIO_ALT_FN_2_IN) | 332 | #define GPIO95_CIF_DD_4_MD (95 | GPIO_ALT_FN_2_IN) |
| 327 | #define GPIO95_KP_MKIN6_MD (95 | GPIO_ALT_FN_3_IN) | 333 | #define GPIO95_KP_MKIN6_MD (95 | GPIO_ALT_FN_3_IN) |
| 328 | #define GPIO96_KP_DKIN3_MD (96 | GPIO_ALT_FN_1_IN) | 334 | #define GPIO96_KP_DKIN3_MD (96 | GPIO_ALT_FN_1_IN) |
| 335 | #define GPIO96_FFRXD_MD (96 | GPIO_ALT_FN_3_IN) | ||
| 329 | #define GPIO97_KP_MKIN3_MD (97 | GPIO_ALT_FN_3_IN) | 336 | #define GPIO97_KP_MKIN3_MD (97 | GPIO_ALT_FN_3_IN) |
| 330 | #define GPIO98_CIF_DD_0_MD (98 | GPIO_ALT_FN_2_IN) | 337 | #define GPIO98_CIF_DD_0_MD (98 | GPIO_ALT_FN_2_IN) |
| 338 | #define GPIO98_FFRTS_MD (98 | GPIO_ALT_FN_3_OUT) | ||
| 339 | #define GPIO99_FFTXD_MD (99 | GPIO_ALT_FN_3_OUT) | ||
| 331 | #define GPIO100_KP_MKIN0_MD (100 | GPIO_ALT_FN_1_IN) | 340 | #define GPIO100_KP_MKIN0_MD (100 | GPIO_ALT_FN_1_IN) |
| 332 | #define GPIO101_KP_MKIN1_MD (101 | GPIO_ALT_FN_1_IN) | 341 | #define GPIO101_KP_MKIN1_MD (101 | GPIO_ALT_FN_1_IN) |
| 333 | #define GPIO102_nPCE_1_MD (102 | GPIO_ALT_FN_1_OUT) | 342 | #define GPIO102_nPCE_1_MD (102 | GPIO_ALT_FN_1_OUT) |