Pull apm-freeze-fix into release branch

[linux-2.6-omap-h63xx.git] / arch / arm / mach-pxa / pxa320.c

diff --git a/arch/arm/mach-pxa/pxa320.c b/arch/arm/mach-pxa/pxa320.c
index cd9eba5b3df95063c2d955fd7dbf20c061a8c462..74128eb8f8d0dd5983585c89203e45410e53cfbc 100644 (file)
--- a/arch/arm/mach-pxa/pxa320.c
+++ b/arch/arm/mach-pxa/pxa320.c
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2007 Marvell Internation Ltd.
  *
- * 2007-08-21: eric miao <eric.y.miao@gmail.com>
+ * 2007-08-21: eric miao <eric.miao@marvell.com>
  *             initial version
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,8 +23,11 @@
 static struct pxa3xx_mfp_addr_map pxa320_mfp_addr_map[] __initdata = {
 
        MFP_ADDR_X(GPIO0,  GPIO4,   0x0124),
-       MFP_ADDR_X(GPIO5,  GPIO26,  0x028C),
-       MFP_ADDR_X(GPIO27, GPIO62,  0x0400),
+       MFP_ADDR_X(GPIO5,  GPIO9,   0x028C),
+       MFP_ADDR(GPIO10, 0x0458),
+       MFP_ADDR_X(GPIO11, GPIO26,  0x02A0),
+       MFP_ADDR_X(GPIO27, GPIO48,  0x0400),
+       MFP_ADDR_X(GPIO49, GPIO62,  0x045C),
        MFP_ADDR_X(GPIO63, GPIO73,  0x04B4),
        MFP_ADDR_X(GPIO74, GPIO98,  0x04F0),
        MFP_ADDR_X(GPIO99, GPIO127, 0x0600),