github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source
This commit is contained in:
黄涛 2013-01-08 11:27:14 +08:00
parent e23fcf37d3
commit a0533e2189
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/mach-rk29/include/mach/gpio.h
View File

@ -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 {

9
arch/arm/plat-rk/include/plat/gpio.h
View File

@ -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 {

2
drivers/gpio/gpiolib.c
View File

@ -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;