From: lw <lw@rock-chips.com>
Date: Sat, 7 Apr 2012 03:48:59 +0000 (+0800)
Subject: rk30:modify gpio pull up or down operation
X-Git-Tag: firefly_0821_release~9455
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c81862690ec4c5e788fd0fb2c40d0cc6d88bda67;p=firefly-linux-kernel-4.4.55.git

rk30:modify gpio pull up or down operation
---

diff --git a/drivers/gpio/gpio-rk30.c b/drivers/gpio/gpio-rk30.c
index 8db816e8c447..3d30d7341fb7 100755
--- a/drivers/gpio/gpio-rk30.c
+++ b/drivers/gpio/gpio-rk30.c
@@ -304,9 +304,9 @@ static int rk30_gpiolib_pull_updown(struct gpio_chip *chip, unsigned offset, uns
 
 	spin_lock_irqsave(&bank->lock, flags);
 	if(offset>=16)	
-	rk30_gpio_bit_op((void *__iomem) RK30_GRF_BASE, GRF_GPIO0H_PULL + bank->id * 8, offset_to_bit(offset-16), !enable);
-	else
-	rk30_gpio_bit_op((void *__iomem) RK30_GRF_BASE, GRF_GPIO0L_PULL + bank->id * 8, offset_to_bit(offset), !enable);
+	rk30_gpio_bit_op((void *__iomem) RK30_GRF_BASE, GRF_GPIO0H_PULL + bank->id * 8, (1<<offset) | offset_to_bit(offset-16), !enable);
+	else	
+	rk30_gpio_bit_op((void *__iomem) RK30_GRF_BASE, GRF_GPIO0L_PULL + bank->id * 8, (1<<(offset+16)) | offset_to_bit(offset), !enable);
 	spin_unlock_irqrestore(&bank->lock, flags);
 
 	return 0;