git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.infradead.org/users/linville/wireless into for...
[pandora-kernel.git]
/
arch
/
arm
/
mach-exynos4
/
setup-keypad.c
diff --git
a/arch/arm/mach-exynos4/setup-keypad.c
b/arch/arm/mach-exynos4/setup-keypad.c
index
1ee0ebf
..
7862bfb
100644
(file)
--- a/
arch/arm/mach-exynos4/setup-keypad.c
+++ b/
arch/arm/mach-exynos4/setup-keypad.c
@@
-19,15
+19,16
@@
void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols)
if (rows > 8) {
/* Set all the necessary GPX2 pins: KP_ROW[0~7] */
if (rows > 8) {
/* Set all the necessary GPX2 pins: KP_ROW[0~7] */
- s3c_gpio_cfgrange_nopull(EXYNOS4_GPX2(0), 8, S3C_GPIO_SFN(3));
+ s3c_gpio_cfgall_range(EXYNOS4_GPX2(0), 8, S3C_GPIO_SFN(3),
+ S3C_GPIO_PULL_UP);
/* Set all the necessary GPX3 pins: KP_ROW[8~] */
/* Set all the necessary GPX3 pins: KP_ROW[8~] */
- s3c_gpio_cfg
range_nopull
(EXYNOS4_GPX3(0), (rows - 8),
- S3C_GPIO_SFN(3));
+ s3c_gpio_cfg
all_range
(EXYNOS4_GPX3(0), (rows - 8),
+ S3C_GPIO_SFN(3)
, S3C_GPIO_PULL_UP
);
} else {
/* Set all the necessary GPX2 pins: KP_ROW[x] */
} else {
/* Set all the necessary GPX2 pins: KP_ROW[x] */
- s3c_gpio_cfg
range_nopull(EXYNOS4_GPX2(0), rows
,
-
S3C_GPIO_SFN(3)
);
+ s3c_gpio_cfg
all_range(EXYNOS4_GPX2(0), rows, S3C_GPIO_SFN(3)
,
+
S3C_GPIO_PULL_UP
);
}
/* Set all the necessary GPX1 pins to special-function 3: KP_COL[x] */
}
/* Set all the necessary GPX1 pins to special-function 3: KP_COL[x] */