From: hhb <hhb@rock-chips.com>
Date: Wed, 29 Jun 2011 10:07:54 +0000 (+0800)
Subject: rk29:GPIO->fix the problem GPIOPullUpDown() could not set the pull  up and down register
X-Git-Tag: firefly_0821_release~10157
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=59d34b9d121a6a80df81fc20de6339b1739423bb;p=firefly-linux-kernel-4.4.55.git

rk29:GPIO->fix the problem GPIOPullUpDown() could not set the pull  up and down register
---

diff --git a/arch/arm/mach-rk29/gpio.c b/arch/arm/mach-rk29/gpio.c
old mode 100755
new mode 100644
index acadc8bc6223..634e97b28d41
--- a/arch/arm/mach-rk29/gpio.c
+++ b/arch/arm/mach-rk29/gpio.c
@@ -361,7 +361,7 @@ static void gpio_ack_irq(u32 irq)
 
 static int GPIOPullUpDown(struct gpio_chip *chip, unsigned int offset, unsigned enable)
 {
-	unsigned char temp=0;
+	unsigned int temp = 0;
 	struct rk29_gpio_chip *rk29_gpio = to_rk29_gpio_chip(chip);
 	unsigned char  __iomem *pGrfRegBase = (unsigned char  __iomem *)RK29_GRF_BASE;
 	unsigned long flags;
@@ -382,6 +382,7 @@ static int GPIOPullUpDown(struct gpio_chip *chip, unsigned int offset, unsigned
 		temp |= 1<<offset;
 	else
 		temp &= ~(1<<offset);
+
 	__raw_writel(temp,pGrfRegBase + 0x78 +(rk29_gpio->id)*4);
 	local_irq_restore(flags);