From 34abb6322725f63a9dfb0e12a69fa5f82dedad63 Mon Sep 17 00:00:00 2001 From: wanzongshun Date: Tue, 14 Jul 2009 15:12:26 +0100 Subject: [PATCH] --- yaml --- r: 160788 b: refs/heads/master c: 0abe1856bdb68ef699c00949cf9f81fbec98d499 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-w90x900/mfp-w90p910.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b6baedfd0291..0a2c45797971 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db58e90fdbe9d12b431ae8d8e856961ce75d74f0 +refs/heads/master: 0abe1856bdb68ef699c00949cf9f81fbec98d499 diff --git a/trunk/arch/arm/mach-w90x900/mfp-w90p910.c b/trunk/arch/arm/mach-w90x900/mfp-w90p910.c index a3520fefb5e7..8aec34b044ca 100644 --- a/trunk/arch/arm/mach-w90x900/mfp-w90p910.c +++ b/trunk/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);