summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-pxa/mfp.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-24 14:05:50 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-24 14:05:50 -0300
commit698158c799c7961824ccdb773250e16c0dd5d9e4 (patch)
tree96f034be9e9a95e6f68b5d20d1a3df7a3cbf724a /include/asm-arm/arch-pxa/mfp.h
parent4c7827eec78abe6fe68fd29305806467f2a51e63 (diff)
parent338b9bb3adac0d2c5a1e180491d9b001d624c402 (diff)
downloadkernel-crypto-698158c799c7961824ccdb773250e16c0dd5d9e4.tar.gz
kernel-crypto-698158c799c7961824ccdb773250e16c0dd5d9e4.tar.xz
kernel-crypto-698158c799c7961824ccdb773250e16c0dd5d9e4.zip
Merge ../linux-2.6
Diffstat (limited to 'include/asm-arm/arch-pxa/mfp.h')
-rw-r--r--include/asm-arm/arch-pxa/mfp.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/mfp.h b/include/asm-arm/arch-pxa/mfp.h
index 02f6157396d..e7d58798da6 100644
--- a/include/asm-arm/arch-pxa/mfp.h
+++ b/include/asm-arm/arch-pxa/mfp.h
@@ -210,6 +210,14 @@ enum {
MFP_PIN_DF_IO14,
MFP_PIN_DF_IO15,
+ /* additional pins on PXA930 */
+ MFP_PIN_GSIM_UIO,
+ MFP_PIN_GSIM_UCLK,
+ MFP_PIN_GSIM_UDET,
+ MFP_PIN_GSIM_nURST,
+ MFP_PIN_PMIC_INT,
+ MFP_PIN_RDY,
+
MFP_PIN_MAX,
};