summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwanzongshun <mcuos.com@gmail.com>2009-07-14 15:12:26 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-07-17 13:38:18 +0100
commit0abe1856bdb68ef699c00949cf9f81fbec98d499 (patch)
tree1f96b372101be3580201c08c8d963e1816c60d8d
parentdb58e90fdbe9d12b431ae8d8e856961ce75d74f0 (diff)
[ARM] 5604/1: Add keypad multi-function pin api for w90p910 platform
Add keypad multi-function pin api for w90p910 platform. Signed-off-by: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-w90x900/mfp-w90p910.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-w90x900/mfp-w90p910.c b/arch/arm/mach-w90x900/mfp-w90p910.c
index a3520fefb5e..8aec34b044c 100644
--- a/arch/arm/mach-w90x900/mfp-w90p910.c
+++ b/arch/arm/mach-w90x900/mfp-w90p910.c
@@ -90,7 +90,7 @@ void mfp_set_groupc(struct device *dev)
}
EXPORT_SYMBOL(mfp_set_groupc);
-void mfp_set_groupi(struct device *dev, int gpio)
+void mfp_set_groupi(struct device *dev)
{
unsigned long mfpen;
const char *dev_id;
@@ -103,10 +103,14 @@ void mfp_set_groupi(struct device *dev, int gpio)
mfpen = __raw_readl(REG_MFSEL);
+ mfpen &= ~GPSELEI1;/*default gpio16*/
+
if (strcmp(dev_id, "w90p910-wdog") == 0)
mfpen |= GPSELEI1;/*enable wdog*/
else if (strcmp(dev_id, "w90p910-atapi") == 0)
mfpen |= GPSELEI0;/*enable atapi*/
+ else if (strcmp(dev_id, "w90p910-keypad") == 0)
+ mfpen &= ~GPSELEI0;/*enable keypad*/
__raw_writel(mfpen, REG_MFSEL);