diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 19:00:54 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 19:00:54 -0500 |
| commit | dca1d9f6d7ae428c193f32bd3e9a4ca13176648b (patch) | |
| tree | 02de8c3503c1c811754423d2fa3f3b4978044f6e /arch/arm/mach-mmp/include/mach/mfp-pxa168.h | |
| parent | 9ff99339447de403a46be5e3f23d0c794d540b06 (diff) | |
| parent | 91e013827c0bcbb187ecf02213c5446b6f62d445 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (370 commits)
ARM: S3C2443: Add set_rate and round_rate calls for armdiv clock
ARM: S3C2443: Remove #if 0 for clk_mpll
ARM: S3C2443: Update notes on MPLLREF clock
ARM: S3C2443: Further clksrc-clk conversions
ARM: S3C2443: Change to using plat-samsung clksrc-clk implementation
USB: Fix s3c-hsotg build following Samsung platform header moves
ARM: S3C64XX: Reintroduce unconditional build of audio device
ARM: 5961/1: ux500: fix CLKRST addresses
ARM: 5977/1: arm: Enable backtrace printing on oops when PC is corrupted
ASoC: Fix S3C64xx IIS driver for Samsung header reorg
ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support
[ARM] pxa: fix typo in mxm8x10.h
[ARM] pxa/raumfeld: set GPIO drive bits for LED pins
[ARM] pxa/zeus: Add support for mcp2515 CAN bus
[ARM] pxa/zeus: Add support for onboard max6369 watchdog
[ARM] pxa/zeus: Add Eurotech as the manufacturer
[ARM] pxa/zeus: Correct the USB host initialisation flags
[ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress
[ARM] pxa: refactor uncompress.h for non-PXA uarts
[ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded IRQs
...
Diffstat (limited to 'arch/arm/mach-mmp/include/mach/mfp-pxa168.h')
| -rw-r--r-- | arch/arm/mach-mmp/include/mach/mfp-pxa168.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/include/mach/mfp-pxa168.h b/arch/arm/mach-mmp/include/mach/mfp-pxa168.h index 3b216bf41e7f..ded43c455ec3 100644 --- a/arch/arm/mach-mmp/include/mach/mfp-pxa168.h +++ b/arch/arm/mach-mmp/include/mach/mfp-pxa168.h | |||
| @@ -193,7 +193,9 @@ | |||
| 193 | #define GPIO32_CF_nCD1 MFP_CFG(GPIO32, AF3) | 193 | #define GPIO32_CF_nCD1 MFP_CFG(GPIO32, AF3) |
| 194 | #define GPIO33_CF_nCD2 MFP_CFG(GPIO33, AF3) | 194 | #define GPIO33_CF_nCD2 MFP_CFG(GPIO33, AF3) |
| 195 | 195 | ||
| 196 | /* UART1 */ | 196 | /* UART */ |
| 197 | #define GPIO88_UART2_TXD MFP_CFG(GPIO88, AF2) | ||
| 198 | #define GPIO89_UART2_RXD MFP_CFG(GPIO89, AF2) | ||
| 197 | #define GPIO107_UART1_TXD MFP_CFG_DRV(GPIO107, AF1, FAST) | 199 | #define GPIO107_UART1_TXD MFP_CFG_DRV(GPIO107, AF1, FAST) |
| 198 | #define GPIO107_UART1_RXD MFP_CFG_DRV(GPIO107, AF2, FAST) | 200 | #define GPIO107_UART1_RXD MFP_CFG_DRV(GPIO107, AF2, FAST) |
| 199 | #define GPIO108_UART1_RXD MFP_CFG_DRV(GPIO108, AF1, FAST) | 201 | #define GPIO108_UART1_RXD MFP_CFG_DRV(GPIO108, AF1, FAST) |