aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-pxa/include
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2009-08-11 14:39:09 +0200
committerEric Miao <eric.y.miao@gmail.com>2009-09-10 18:49:24 +0800
commitfb60870f630f926d2299b6ebd31fc94714dcd734 (patch)
tree64aec7edf3f57d0a4a5497bca8616801f576bf13 /arch/arm/plat-pxa/include
parent9304d008d6ba41ff52ef6eae44337398e83b4436 (diff)
downloadkernel_samsung_smdk4412-fb60870f630f926d2299b6ebd31fc94714dcd734.zip
kernel_samsung_smdk4412-fb60870f630f926d2299b6ebd31fc94714dcd734.tar.gz
kernel_samsung_smdk4412-fb60870f630f926d2299b6ebd31fc94714dcd734.tar.bz2
[ARM] pxa: add MFP_PULL_FLOAT
There is currently an uncovered case for MFP configuration on PXAs which is selected by setting the PULL_SEL bit but none of the PULL{UP,DOWN}_EN bits. This case is needed to explicitly let pins float, even if the selected alternate function would default to a configuration with a pull resistor enabled. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/plat-pxa/include')
-rw-r--r--arch/arm/plat-pxa/include/plat/mfp.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/plat-pxa/include/plat/mfp.h b/arch/arm/plat-pxa/include/plat/mfp.h
index 6401946..08ad665 100644
--- a/arch/arm/plat-pxa/include/plat/mfp.h
+++ b/arch/arm/plat-pxa/include/plat/mfp.h
@@ -325,8 +325,9 @@ typedef unsigned long mfp_cfg_t;
#define MFP_PULL_LOW (0x1 << 21)
#define MFP_PULL_HIGH (0x2 << 21)
#define MFP_PULL_BOTH (0x3 << 21)
-#define MFP_PULL_MASK (0x3 << 21)
-#define MFP_PULL(x) (((x) >> 21) & 0x3)
+#define MFP_PULL_FLOAT (0x4 << 21)
+#define MFP_PULL_MASK (0x7 << 21)
+#define MFP_PULL(x) (((x) >> 21) & 0x7)
#define MFP_CFG_DEFAULT (MFP_AF0 | MFP_DS03X | MFP_LPM_DEFAULT |\
MFP_LPM_EDGE_NONE | MFP_PULL_NONE)