diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-19 02:46:36 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-19 02:46:36 -0400 |
| commit | 48a5765e5104f1afd22c75c5030af3a6cf24b4c3 (patch) | |
| tree | ec2668d208146182d5ec6f5eba5d1a7266e10715 /arch/arm/mach-pxa/include | |
| parent | 0e6ce5f168e3b600b88d7e1a08c5b85cbceec6cb (diff) | |
| parent | b2596c682814b39f0dd16e19e3be8fc8581643bd (diff) | |
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
* 'board-specific' of git://github.com/hzhuang1/linux:
ARM: pxa: hx4700: Add Synaptics NavPoint touchpad
ARM: pxa: Use REGULATOR_SUPPLY macro
Diffstat (limited to 'arch/arm/mach-pxa/include')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h index a65867209aa0..a611ad3153c7 100644 --- a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h +++ b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | |||
| @@ -208,6 +208,7 @@ | |||
| 208 | #define GPIO113_I2S_SYSCLK MFP_CFG_OUT(GPIO113, AF1, DRIVE_LOW) | 208 | #define GPIO113_I2S_SYSCLK MFP_CFG_OUT(GPIO113, AF1, DRIVE_LOW) |
| 209 | 209 | ||
| 210 | /* SSP 1 */ | 210 | /* SSP 1 */ |
| 211 | #define GPIO23_SSP1_SCLK_IN MFP_CFG_IN(GPIO23, AF2) | ||
| 211 | #define GPIO23_SSP1_SCLK MFP_CFG_OUT(GPIO23, AF2, DRIVE_LOW) | 212 | #define GPIO23_SSP1_SCLK MFP_CFG_OUT(GPIO23, AF2, DRIVE_LOW) |
| 212 | #define GPIO29_SSP1_SCLK MFP_CFG_IN(GPIO29, AF3) | 213 | #define GPIO29_SSP1_SCLK MFP_CFG_IN(GPIO29, AF3) |
| 213 | #define GPIO27_SSP1_SYSCLK MFP_CFG_OUT(GPIO27, AF1, DRIVE_LOW) | 214 | #define GPIO27_SSP1_SYSCLK MFP_CFG_OUT(GPIO27, AF1, DRIVE_LOW) |