rk: gpio: fix GPIOPullType define and no clear FLAG_IS_OUT when pull updown

diff --git a/arch/arm/mach-rk29/include/mach/gpio.h b/arch/arm/mach-rk29/include/mach/gpio.h
index a0f0309cbe8fdee3ec4a9489f56574c73f76596b..32c581519485db472fe313a91bce6eaa7cb7d9a7 100755 (executable)
--- a/arch/arm/mach-rk29/include/mach/gpio.h
+++ b/arch/arm/mach-rk29/include/mach/gpio.h
@@ -31,11 +31,10 @@ typedef enum eGPIOPinDirection
 
 typedef enum GPIOPullType {
        PullDisable = 0,
-       PullEnable,
-       GPIONormal,  //PullEnable, please do not use it
-       GPIOPullUp,     //PullEnable, please do not use it
-       GPIOPullDown,//PullEnable, please do not use it
-       GPIONOInit,//PullEnable, please do not use it
+       PullEnable = 1,
+       GPIONormal = PullDisable,
+       GPIOPullUp = 1,
+       GPIOPullDown = 2,
 }eGPIOPullType_t;
 
 typedef enum GPIOIntType {

diff --git a/arch/arm/plat-rk/include/plat/gpio.h b/arch/arm/plat-rk/include/plat/gpio.h
index f4a35ec889ded84b31096a81f243469cce797223..76cfb23f158459e605e59db06b602240cb60c348 100644 (file)
--- a/arch/arm/plat-rk/include/plat/gpio.h
+++ b/arch/arm/plat-rk/include/plat/gpio.h
@@ -284,11 +284,10 @@ typedef enum eGPIOPinDirection
 
 typedef enum GPIOPullType {
        PullDisable = 0,
-       PullEnable,
-       GPIONormal,  //PullEnable, please do not use it
-       GPIOPullUp,     //PullEnable, please do not use it
-       GPIOPullDown,//PullEnable, please do not use it
-       GPIONOInit,//PullEnable, please do not use it
+       PullEnable = 1,
+       GPIONormal = PullDisable,
+       GPIOPullUp = 1,
+       GPIOPullDown = 2,
 }eGPIOPullType_t;
 
 typedef enum GPIOIntType {

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 95a097256c97f7f37d9d26975c56bce16da8edd6..482dec010e5332107508a0c4d17985c765d336a3 100755 (executable)
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1529,8 +1529,6 @@ int gpio_pull_updown(unsigned gpio, unsigned value)
                }
        }
        status = chip->pull_updown(chip, gpio,value);
-       if (status == 0)
-               clear_bit(FLAG_IS_OUT, &desc->flags);
        
 lose:
        return status;