diff options
| author | Eric Miao <eric.y.miao@gmail.com> | 2010-04-27 11:14:24 +0800 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2010-05-11 17:25:00 +0200 |
| commit | 1fe8c2bcad52d16e4d31d3680b9bb536c56df3d8 (patch) | |
| tree | 50a8b30ad3e19b106ab79c38c74705bf890d1098 | |
| parent | c09f431c338cf032c68ea68915f4dd85d92fd526 (diff) | |
| download | linux-1fe8c2bcad52d16e4d31d3680b9bb536c56df3d8.tar.bz2 | |
[ARM] pxa: allow MFP_LPM_INPUT to be explicitly specified
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| -rw-r--r-- | arch/arm/mach-pxa/mfp-pxa2xx.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-pxa/mfp.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c index e5b79210a90b..1d1419b73457 100644 --- a/arch/arm/mach-pxa/mfp-pxa2xx.c +++ b/arch/arm/mach-pxa/mfp-pxa2xx.c @@ -81,6 +81,7 @@ static int __mfp_config_gpio(unsigned gpio, unsigned long c) PGSR(bank) &= ~mask; is_out = 1; break; + case MFP_LPM_INPUT: case MFP_LPM_DEFAULT: break; default: diff --git a/arch/arm/plat-pxa/mfp.c b/arch/arm/plat-pxa/mfp.c index be58f9fe65b0..b77e018d36c1 100644 --- a/arch/arm/plat-pxa/mfp.c +++ b/arch/arm/plat-pxa/mfp.c @@ -110,6 +110,7 @@ static const unsigned long mfpr_lpm[] = { MFPR_LPM_PULL_LOW, MFPR_LPM_PULL_HIGH, MFPR_LPM_FLOAT, + MFPR_LPM_INPUT, }; /* mapping of MFP_PULL_* definitions to MFPR_PULL_* register bits */ |